Merge remote-tracking branch 'origin/master'

yxt-supervise-cyf/docs/databases/create_table.sql

@@ -48,6 +48,8 @@ CREATE TABLE `crude_oil_type_information`  (
 `number` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '原油编号',
 `code` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '原油code',
 `price` double(100, 2) NULL DEFAULT NULL COMMENT '原油价格',
+`unit` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '单位',
+`proSpec` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '商品规格',
 PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 11 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '原油类型' ROW_FORMAT = Dynamic;
 
@@ -172,6 +174,8 @@ CREATE TABLE `material_inventory`(
 `initialInventory` double(100, 2) NULL DEFAULT NULL COMMENT '原料初始库存',
 `typeSid` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '原料类型sid',
 `price` double(100, 2) NULL DEFAULT NULL COMMENT '原料价格',
+`unit` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '单位',
+`proSpec` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '商品规格',
 PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 8 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '原料库存' ROW_FORMAT = Dynamic;
 
@@ -499,6 +503,8 @@ CREATE TABLE `packaging_inventory`  (
 `inventory` double(100, 0) NULL DEFAULT NULL COMMENT '包装物库存',
   `initialInventory` double(100, 0) NULL DEFAULT NULL COMMENT '包装物初始库存',
   `typeSid` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '包装物类型sid',
+  `unit` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '单位',
+`proSpec` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '商品规格',
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '包装物库存' ROW_FORMAT = Dynamic;
 

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoiloutbound/CrudeOilOutboundAppMapper.xml

@@ -5,7 +5,7 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.crudeoiloutbound.CrudeOilOutboundVo">
         SELECT
-        *,t.number as tankNumber,i.number as crudeNumber,i.name as crudeName,t.inventory as inventory,f.number as flowmeterNumber ,f.name as flowmeterName
+        c.*,t.number as tankNumber,i.number as crudeNumber,i.name as crudeName,t.inventory as inventory,f.number as flowmeterNumber ,f.name as flowmeterName
         FROM
         crude_oil_outbound c
         left join  tank_information t on t.sid =c.tankSid

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoilpricerecord/CrudeOilPriceRecordAppMapper.xml

@@ -5,7 +5,7 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.crudeoilpricerecord.CrudeOilPriceRecordVo">
         SELECT
-        *,t.number as tankNumber,i.number as crudeNumber,i.name as crudeName,t.inventory as inventory,
+        c.*,t.number as tankNumber,i.number as crudeNumber,i.name as crudeName,t.inventory as inventory,
         s.supplierName as supplierName
         FROM
         crude_oil_storage c

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoilstorage/CrudeOilStorageAppMapper.java

@@ -41,9 +41,9 @@ public interface CrudeOilStorageAppMapper extends BaseMapper<CrudeOilStorage> {
             "\tLEFT JOIN procurement_details p ON p.sid = c.procSid\n" +
             "\tLEFT JOIN tank_information t ON t.sid = c.tankSid\n" +
             "\tLEFT JOIN crude_oil_type_information o ON o.sid = t.crudeSid\n" +
-            "\twhere c.procSid =#{procSid}\n" +
+            "\twhere c.procSid =#{procSid} and t.crudeSid =#{crudeSid}\n" +
             "\tGROUP BY p.typeSid")
-    List<CrudeOilStorageVo> getCrudeByProcSid(@Param("procSid")String procSid);
+    List<CrudeOilStorageVo> getCrudeByProcSid(@Param("procSid")String procSid,@Param("crudeSid")String crudeSid);
     @Select("SELECT\n" +
             "\tc.sid as typeSid\n" +
             "FROM\n" +

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoilstorage/CrudeOilStorageAppMapper.xml

@@ -5,7 +5,7 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.crudeoilstorage.CrudeOilStorageVo">
         SELECT
-        *,t.number as tankNumber,i.number as crudeNumber,i.name as crudeName,t.inventory as inventory,
+        c.*,t.number as tankNumber,i.number as crudeNumber,i.name as crudeName,t.inventory as inventory,
         s.supplierName as supplierName
         FROM
         crude_oil_storage c

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/crudeoilstorage/CrudeOilStorageAppService.java

@@ -60,24 +60,33 @@ public class CrudeOilStorageAppService extends MybatisBaseService<CrudeOilStorag
     }
     @Transactional
     public ResultBean save(CrudeOilStorageDto dto){
-
         ResultBean rb=new ResultBean();
         Date curDate = new Date();
         String dfmt = DateUtil.format(curDate, "yyyy-MM-dd");
-        if((null!=dto.getProcSid()&& ""!=dto.getProcSid())){
+        //没有订单编号也能录入
+        if(null!=dto.getProcSid()&& ""!=dto.getProcSid()){
             SysUser sysUser=sysUserMapper.selectOne(new QueryWrapper<SysUser>().eq("id", StpUtil.getLoginIdAsString()));
-            //入库记录
-            List<CrudeOilStorageVo> list=baseMapper.getCrudeByProcSid(dto.getProcSid());
             //要入的的原油类型
             CrudeOilStorageVo v=baseMapper.getTypeByTankSid(dto.getTankSid());
+            //入库记录
+            List<CrudeOilStorageVo> list=baseMapper.getCrudeByProcSid(dto.getProcSid(),v.getTypeSid());
             ProcurementDetails procurementDetails=procurementDetailsMapper.selectOne(new QueryWrapper<ProcurementDetails>().eq("sid",dto.getProcSid()).eq("typeSid",v.getTypeSid()));
             if(null==procurementDetails){
                 return rb.setMsg("订单中没有，所选的原油类型");
             }
             for(CrudeOilStorageVo vo:list){
-                if(v.getTypeSid().equals(vo.getTypeSid())){
-                    if( (vo.getWeight()+dto.getWeight())>vo.getPWeight()){
-                        return rb.setMsg("输入的价值大于采购订单的价值,请验证是否正确");
+                double q=0;
+                if(null==vo){
+                    if(v.getTypeSid().equals(vo.getTypeSid())){
+                        if( (q+dto.getWeight())>vo.getPWeight()){
+                            return rb.setMsg("输入的价值大于采购订单的价值,请验证是否正确");
+                        }
+                    }
+                }else{
+                    if(v.getTypeSid().equals(vo.getTypeSid())){
+                        if( (vo.getTotal()+dto.getWeight())>vo.getPWeight()){
+                            return rb.setMsg("输入的价值大于采购订单的价值,请验证是否正确");
+                        }
                     }
                 }
             }
@@ -85,9 +94,8 @@ public class CrudeOilStorageAppService extends MybatisBaseService<CrudeOilStorag
             List<ProcurementDetails> selectList=procurementDetailsMapper.selectList(new QueryWrapper<ProcurementDetails>().eq("sid",dto.getProcSid()));
             int i=0;
             for(ProcurementDetails p:selectList){
-                CrudeOilStorageVo crude= baseMapper.getCrudeByCrudeSid(p.getTypeSid(),p.getSid());
+                CrudeOilStorageVo crude= baseMapper.getCrudeByCrudeSid(v.getTypeSid(), p.getSid());
                 double total=0;
-//                if(p.getTypeSid()!=)
                 if(null!=crude){
                     total=crude.getTotal();
                 }
@@ -135,13 +143,6 @@ public class CrudeOilStorageAppService extends MybatisBaseService<CrudeOilStorag
         baseMapper.insert(entity);
         //油罐库存增加
         TankInformation tank=tankInformationMapper.getTankBySid(dto.getTankSid());
-        //第一次入库/出库的时候用初始库存减去要出入的数量 给总库存
-//        if(tank.getLockVersion().equals(0)){
-//            tank.setInventory(tank.getInitialInventory()+dto.getWeight());
-//            tank.setLockVersion(tank.getLockVersion()+1);
-//        }else{
-//            tank.setInventory(tank.getInventory()+dto.getWeight());
-//        }
         tank.setInventory(tank.getInventory()+dto.getWeight());
         tankInformationMapper.updateById(tank);
         return rb.success().setMsg("新增成功");

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/procurementdetails/ProcurementDetailsAppMapper.java

@@ -20,7 +20,7 @@ import java.util.List;
 @Mapper
 public interface ProcurementDetailsAppMapper extends BaseMapper<ProcurementDetails> {
     IPage<ProcurementDetailsVo> selectPageVo(IPage<ProcurementDetails> page, @Param(Constants.WRAPPER) Wrapper<ProcurementDetails> qw,@Param("type") String type);
-    @Select("select * from procurement_details where state =#{state}")
+    @Select("select * from procurement_details where state =#{state} group by sid")
     List<ProcurementDetailsVo> listByState(String state);
     @Select("        SELECT" +
             "        *,t.name as typeName,i.inventory as inventory" +

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilinventoryrecord/CrudeOilInventoryRecordMapper.xml

@@ -5,7 +5,7 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.crudeoilinventoryrecord.CrudeOilInventoryRecordVo">
         SELECT
-        *,t.number as tankNumber
+        c.*,t.number as tankNumber
         FROM
         crude_oil_inventory_record c
         left join  tank_information t on t.sid =c.tankSid

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiloutbound/CrudeOilOutboundMapper.xml

@@ -5,7 +5,7 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.crudeoiloutbound.CrudeOilOutboundVo">
         SELECT
-        *,t.number as tankNumber,i.number as crudeNumber,i.name as crudeName,t.inventory as inventory,f.number as flowmeterNumber ,f.name as flowmeterName
+        c.*,t.number as tankNumber,i.number as crudeNumber,i.name as crudeName,t.inventory as inventory,f.number as flowmeterNumber ,f.name as flowmeterName
         FROM
         crude_oil_outbound c
         left join  tank_information t on t.sid =c.tankSid

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilpricerecord/CrudeOilPriceRecordMapper.xml

@@ -5,7 +5,7 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.crudeoilpricerecord.CrudeOilPriceRecordVo">
         SELECT
-        *,t.number as tankNumber,i.number as crudeNumber,i.name as crudeName,t.inventory as inventory,
+        c.*,t.number as tankNumber,i.number as crudeNumber,i.name as crudeName,t.inventory as inventory,
         s.supplierName as supplierName
         FROM
         crude_oil_storage c

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilstorage/CrudeOilStorageMapper.java

@@ -44,9 +44,9 @@ public interface CrudeOilStorageMapper extends BaseMapper<CrudeOilStorage> {
             "\tLEFT JOIN procurement_details p ON p.sid = c.procSid\n" +
             "\tLEFT JOIN tank_information t ON t.sid = c.tankSid\n" +
             "\tLEFT JOIN crude_oil_type_information o ON o.sid = t.crudeSid\n" +
-            "\twhere c.procSid =#{procSid}\n" +
+            "\twhere c.procSid =#{procSid} and t.crudeSid =#{crudeSid}\n" +
             "\tGROUP BY p.typeSid")
-    List<CrudeOilStorageVo> getCrudeByProcSid(@Param("procSid")String procSid);
+    List<CrudeOilStorageVo> getCrudeByProcSid(@Param("procSid")String procSid,@Param("crudeSid")String crudeSid);
     @Select("SELECT\n" +
             "\tc.sid as typeSid\n" +
             "FROM\n" +

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilstorage/CrudeOilStorageMapper.xml

@@ -5,7 +5,7 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.crudeoilstorage.CrudeOilStorageVo">
         SELECT
-        *,t.number as tankNumber,i.number as crudeNumber,i.name as crudeName,t.inventory as inventory,
+        c.*,t.number as tankNumber,i.number as crudeNumber,i.name as crudeName,t.inventory as inventory,
         s.supplierName as supplierName,d.orderNumber as contractNumber
         FROM
         crude_oil_storage c

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilstorage/CrudeOilStorageService.java

@@ -70,18 +70,27 @@ public class CrudeOilStorageService extends MybatisBaseService<CrudeOilStorageMa
         //没有订单编号也能录入
         if(null!=dto.getProcSid()&& ""!=dto.getProcSid()){
             SysUser sysUser=sysUserMapper.selectOne(new QueryWrapper<SysUser>().eq("id", StpUtil.getLoginIdAsString()));
-            //入库记录
-            List<CrudeOilStorageVo> list=baseMapper.getCrudeByProcSid(dto.getProcSid());
             //要入的的原油类型
             CrudeOilStorageVo v=baseMapper.getTypeByTankSid(dto.getTankSid());
+            //入库记录
+            List<CrudeOilStorageVo> list=baseMapper.getCrudeByProcSid(dto.getProcSid(),v.getTypeSid());
             ProcurementDetails procurementDetails=procurementDetailsMapper.selectOne(new QueryWrapper<ProcurementDetails>().eq("sid",dto.getProcSid()).eq("typeSid",v.getTypeSid()));
             if(null==procurementDetails){
                 return rb.setMsg("订单中没有，所选的原油类型");
             }
             for(CrudeOilStorageVo vo:list){
-                if(v.getTypeSid().equals(vo.getTypeSid())){
-                    if( (vo.getWeight()+dto.getWeight())>vo.getPWeight()){
-                        return rb.setMsg("输入的价值大于采购订单的价值,请验证是否正确");
+                double q=0;
+                if(null==vo){
+                    if(v.getTypeSid().equals(vo.getTypeSid())){
+                        if( (q+dto.getWeight())>vo.getPWeight()){
+                            return rb.setMsg("输入的价值大于采购订单的价值,请验证是否正确");
+                        }
+                    }
+                }else{
+                    if(v.getTypeSid().equals(vo.getTypeSid())){
+                        if( (vo.getTotal()+dto.getWeight())>vo.getPWeight()){
+                            return rb.setMsg("输入的价值大于采购订单的价值,请验证是否正确");
+                        }
                     }
                 }
             }
@@ -89,9 +98,8 @@ public class CrudeOilStorageService extends MybatisBaseService<CrudeOilStorageMa
             List<ProcurementDetails> selectList=procurementDetailsMapper.selectList(new QueryWrapper<ProcurementDetails>().eq("sid",dto.getProcSid()));
             int i=0;
              for(ProcurementDetails p:selectList){
-                CrudeOilStorageVo crude= baseMapper.getCrudeByCrudeSid(p.getTypeSid(),p.getSid());
+                CrudeOilStorageVo crude= baseMapper.getCrudeByCrudeSid(v.getTypeSid(), p.getSid());
                 double total=0;
-//                if(p.getTypeSid()!=)
                 if(null!=crude){
                     total=crude.getTotal();
                 }

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialinventory/MaterialInventoryMapper.xml

@@ -5,7 +5,7 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.materialinventory.MaterialInventoryVo">
         SELECT
-        *,t.name as typeName
+        r.*,t.name as typeName
         FROM
         material_inventory r
         left join material_type t on t.sid=r.typeSid

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialinventoryrecord/MaterialInventoryRecordMapper.xml

@@ -5,7 +5,7 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.materialinventoryrecord.MaterialInventoryRecordVo">
         SELECT
-        *,i.name as name,i.inventory as inventory,t.name as typeName
+        r.*,i.name as name,i.inventory as inventory,t.name as typeName
         FROM
         material_inventory_record r
         left join material_inventory i on r.inventorySid =i.sid

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialoutbound/MaterialOutboundMapper.xml

@@ -5,7 +5,7 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.materialoutbound.MaterialOutboundVo">
         SELECT
-        *,t.name as typeName,i.inventory as inventory
+        o.*,t.name as typeName,i.inventory as inventory
         FROM
         material_outbound o
         left join material_inventory i on i.sid=o.inventorySid

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialstorage/MaterialStorageMapper.xml

@@ -5,7 +5,7 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.materialstorage.MaterialStorageVo">
         SELECT
-        *,t.name as typeName,i.inventory as inventory
+        s.*,t.name as typeName,i.inventory as inventory
         FROM
         material_storage s
         left join material_inventory i on i.sid=s.inventorySid

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventory/PackagingInventoryMapper.xml

@@ -5,7 +5,7 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.packaginginventory.PackagingInventoryVo">
         SELECT
-        *,t.name as typeName
+        r.*,t.name as typeName
         FROM
         packaging_inventory r
         left join packaging_type t on t.sid=r.typeSid

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventoryrecord/PackagingInventoryRecordMapper.xml

@@ -5,7 +5,7 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.packaginginventoryrecord.PackagingInventoryRecordVo">
         SELECT
-        *,i.name as name,i.inventory as inventory,t.name as typeName
+        r.*,i.name as name,i.inventory as inventory,t.name as typeName
         FROM
         packaging_inventory_record r
         left join packaging_inventory i on r.inventorySid =i.sid

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingoutbound/PackagingOutboundMapper.xml

@@ -5,7 +5,7 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.packagingoutbound.PackagingOutboundVo">
         SELECT
-        *,t.name as typeName,i.inventory as inventory
+        o.*,t.name as typeName,i.inventory as inventory
         FROM
         packaging_outbound o
         left join packaging_inventory i on i.sid=o.inventorySid

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingstorage/PackagingStorageMapper.xml

@@ -5,7 +5,7 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.packagingstorage.PackagingStorageVo">
         SELECT
-        *,t.name as typeName,i.inventory as inventory,
+        s.*,t.name as typeName,i.inventory as inventory,
         u.sid as supplierSid, u.supplierName as supplierName
         FROM
         packaging_storage s

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/procurementdetails/ProcurementDetailsMapper.java

@@ -22,6 +22,23 @@ import java.util.Map;
 @Mapper
 public interface ProcurementDetailsMapper extends BaseMapper<ProcurementDetails> {
     IPage<ProcurementDetailsVo> selectPageVo(IPage<ProcurementDetails> page, @Param(Constants.WRAPPER) Wrapper<ProcurementDetails> qw,@Param("type") String type);
+    @Select("\t        SELECT\n" +
+            "\n" +
+            "            d.*,\n" +
+            "            case d.state\n" +
+            "            when 1 then '待提交'\n" +
+            "            when 2 then '经理审批'\n" +
+            "            when 3 then '监管审批'\n" +
+            "            when 4 then '银行审批'\n" +
+            "            when 5 then '财务审批'\n" +
+            "            when 6 then '在途'\n" +
+            "            when 7 then '已入库'\n" +
+            "            end as stateValue\n" +
+            "        FROM\n" +
+            "        procurement_details d\n" +
+            "        where d.sid=#{sid}\n" +
+            "\t\t\t\torder by d.state asc LIMIT 1")
+    ProcurementDetailsVo getProcurementByState(@Param("sid") String sid);
     @Select("select * from procurement_details where state =#{state} group by sid")
     List<ProcurementDetailsVo> listByState(String state);
     @Select("        SELECT" +

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/procurementdetails/ProcurementDetailsService.java

@@ -67,6 +67,10 @@ public class ProcurementDetailsService extends MybatisBaseService<ProcurementDet
         String type =query.getType();
         IPage<ProcurementDetails> page = PagerUtil.queryToPage(pq);
         IPage<ProcurementDetailsVo> pagging = baseMapper.selectPageVo(page, qw,type);
+        for(ProcurementDetailsVo v:pagging.getRecords()){
+            ProcurementDetailsVo c=baseMapper.getProcurementByState(v.getSid());
+            v.setStateValue(c.getStateValue());
+        }
         PagerVo<ProcurementDetailsVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }

yxt-supervise-cyf/yxt-supervise-cyf-ui/.env.development

@@ -9,5 +9,5 @@ VUE_APP_BASE_API = '/api'
 # VUE_APP_URL = "http://192.168.1.105:7101"
 
 
- VUE_APP_URL = "http://192.168.1.193:7101"
+ VUE_APP_URL = "http://192.168.1.107:7101"
 ##VUE_APP_URL = "http://8.130.39.13:8112"

yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/oilTypeInBoundList/index.vue

@@ -242,7 +242,7 @@
         // if (this.index == "0") {
         this.loadLogList()
         // } else if (this.index == "1") {
-        this.loadIn112List()
+        // this.loadIn112List()
         // }
 
       },
@@ -273,7 +273,7 @@
       },
       init() {
         this.loadLogList()
-        this.loadIn112List()
+        // this.loadIn112List()
       },
       purchase(row) {
         this.dialogTitle = "数据";

yxt-supervise-cyf/yxt-supervise-cyf-uniapp/common/config.js

@@ -6,9 +6,9 @@
  * loginTimeoutPage = "/pages/login/index", // 登录超时或失效的情况下，跳转到的登录页面
  */
 module.exports = {
-	// baseUrl: 'http://192.168.1.193:7101',
+	baseUrl: 'http://192.168.1.107:7101',
 	// baseUrl: 'http://wu5dx5.natappfree.cc/',
-	baseUrl: 'http://cyf.yyundong.com/api/',
+	// baseUrl: 'http://cyf.yyundong.com/api/',
 	tokenName: "satoken", // 请求头中token的名字，与服务器端对应
 	loginTimeoutCode: "5001", // 登录超时或失效的情况下，服务器端返回的错误码
 	loginTimeoutPage: "/pages/login/index", // 登录超时或失效的情况下，跳转到的登录页面

yxt-supervise-cyf/yxt-supervise-cyf-uniapp/common/request.api.js

@@ -6,6 +6,8 @@ export default {
 	getSalesReport: (params = {}) => request.get("/system/reportCenter/getSalesReport", params),
 	getGoodsOnWay: (params = {}) => request.get("/system/reportCenter/getGoodsOnWay", params),
 	getThresholdAnalysis: (params = {}) => request.get("/system/risk/getThresholdAnalysis", params),
+	// 合同编号类型 数据字典
+	procurementList: (params = {}) => request.post("/cyf/app/procurement/list", params),
 	// 原油类型 数据字典
 	crudeinfoList: (params = {}) => request.post("/cyf/app/crudeinfo/list", params),
 	// 油罐类型 数据字典

yxt-supervise-cyf/yxt-supervise-cyf-uniapp/manifest.json

@@ -2,8 +2,8 @@
     "name" : "醇油坊监管",
     "appid" : "__UNI__EDBF66C",
     "description" : "醇油坊进销存管理平台监管工具",
-    "versionName" : "1.0.0",
-    "versionCode" : 100,
+    "versionName" : "1.0.0.1",
+    "versionCode" : 1001,
     "transformPx" : false,
     "app-plus" : {
         "optimization" : {

yxt-supervise-cyf/yxt-supervise-cyf-uniapp/pages/business/inBound.vue

@@ -4,7 +4,9 @@
 
 			<view class="item">
 				<text class="item_text">合同编号：</text>
-				<input v-model="formobj.contractNumber" placeholder="" class="item_input" clearable />
+				<uni-data-select style="flex-grow: 1;" v-model="formobj.contractNumber" :localdata="contractNumber"
+					@change="contractNumberChange"></uni-data-select>
+				<!-- <input v-model="formobj.contractNumber" placeholder="" class="item_input" clearable /> -->
 			</view>
 			<view class="item">
 				<text class="item_text" style="margin-left: -9px;">供货商名称：</text>
@@ -46,7 +48,7 @@
 			</view>
 			<view class="item">
 				<text class="item_text">收料价值：</text>
-				<input v-model="formobj.value" placeholder=""type="number" @input="input2" class="item_input"
+				<input v-model="formobj.value" placeholder="" type="number" @input="input2" class="item_input"
 					clearable />
 			</view>
 			<view class="item">
@@ -88,6 +90,8 @@
 		data() {
 			return {
 				uploadAction: config.baseUrl + "/file/upload",
+				contractNumbers: [],
+				contractNumber: [],
 				supplierLists: [],
 				supplierList: [],
 				crudeLists: [],
@@ -97,6 +101,7 @@
 				imgList: [],
 				formobj: {
 					sid: "",
+					contractNumberSid: "",
 					contractNumber: "",
 					contractSigningDate: "",
 					warehousingDate: "",
@@ -231,6 +236,13 @@
 				this.formobj.warehousingDate = e
 
 			},
+			contractNumberChange(e){
+				console.log('e>>>>>', e);
+				const choose = this.contractNumbers.filter((item) => item.sid === e)
+				console.log(">>>>>>>>>getType", choose[0])
+				this.formobj.procSid =e
+				this.formobj.contractNumber = choose[0].supplierName
+			},
 			supplierChange(e) {
 				console.log('e>>>>>', e);
 				const choose = this.supplierLists.filter((item) => item.sid === e)
@@ -279,6 +291,22 @@
 				// this.queryParams.type = e
 			},
 			initData() {
+				// 获取采购订单 数据字典
+				this.$api.procurementList({}).then(res => {
+					console.log("contractNumber>>>", res);
+					// this.resinfo = res
+					this.contractNumbers = res
+					this.contractNumber = []
+					for (var i = 0; i < this.contractNumbers.length; i++) {
+						let item = {
+							"value": this.contractNumbers[i].sid,
+							"text": this.contractNumbers[i].orderNumber
+						}
+						this.contractNumber.push(item)
+					}
+				
+				})
+				
 				// 获取供货商 数据字典
 				this.$api.supplierList({}).then(res => {
 					console.log("supplierList>>>", res);

yxt-supervise-cyf/yxt-supervise-cyf-uniapp/pages/login/login.vue

@@ -36,7 +36,7 @@
 				// 表单数据
 				formData: {
 					userName: 'admin',
-					password: '123456'
+					password: 'admin'
 				},
 				rules: {
 					// 对name字段进行必填验证