Merge branch 'master' of http://62.234.61.92:3000/wjm/mec-cloud_IntelligentManufacturing_CLIENT

zkqy-business/src/main/java/com/zkqy/business/controller/CommonBtnController.java

@@ -123,6 +123,7 @@ public class CommonBtnController extends BaseController {
                 BpmRunNodeFormDateVo bpmRunNodeFormDateVo = JSON.parseObject(JSON.toJSONString(commonEntity.getBasicMap().get("BpmRunNodeFormDateVo")), BpmRunNodeFormDateVo.class);
                 return AjaxResult.btnMessage(echoNodeFormData.handleSubmitForm(bpmRunNodeFormDateVo));
             } else {
+                // 单个表单添加逻辑
                 return AjaxResult.btnMessage(commonService.batchInsert(commonEntity));
             }
         } else if (commonEntity.getBasicMap().get("visible").toString().equals("false")) {

zkqy-custom-business/src/main/java/com/zkqy/business/controller/MaterialInventoryController.java

@@ -115,7 +115,7 @@ public class MaterialInventoryController extends BaseController {
         //1、禁止重复入库
         InboundRecords inboundRecords = inboundRecordsMapper.selectInboundRecordsByQtCodeNumber(materialInventoryVo.getQtCodeNumber());
         if (inboundRecords == null) {
-            return AjaxResult.error("此货品还没有入库，不能出库");
+            return AjaxResult.success("此货品还没有入库，不能出库");
         }
         //2、是否重复入库
         OutboundRecords outboundRecords = outboundRecordsMapper.selectOutboundRecordsByQtCodeNumber(materialInventoryVo.getQtCodeNumber());
@@ -136,6 +136,7 @@ public class MaterialInventoryController extends BaseController {
             outboundRecords1.setOutboundTime(new Date());//出库时间
             //物料名称需要根据物料编码查询下
             Materiel materiel = materielMapper.selectMaterielByMaterielCode(materialInventoryVo.getMaterialCode());
+            outboundRecords1.setQtCodeNumber(materialInventoryVo.getQtCodeNumber());
             outboundRecords1.setOutboundAterialsName(materiel.getMaterielName());//物料名称
             outboundRecords1.setOutboundNo(UUID.randomUUID().toString());//出库编号
             outboundRecords1.setSpecifications(materialInventoryVo.getSpecifications());//规格代号

zkqy-custom-business/src/main/java/com/zkqy/business/service/impl/MaterialCirculationServiceImpl.java

@@ -121,13 +121,13 @@ public class MaterialCirculationServiceImpl implements IMaterialCirculationServi
         MaterialInventory materialInventory = materialInventoryMapper.selectMaterialInventoryByMaterialCode(materialCirculation.getGoodsnum());
         if (materialInventory == null) {
 //            return AjaxResult.warn("当前库存中无此货品信息！");
-            return AjaxResult.warn("库存中无此货品！");
+            return AjaxResult.success("库存中无此货品！");
         }
         Double weight = Double.valueOf(materialCirculation.getWeight());
         //判断出库数量是否大于库存数量
         if(weight > materialInventory.getQuantity()){
 //            return AjaxResult.warn("当前库存中货品数量不足！");
-            return AjaxResult.warn("库存数量不足！");
+            return AjaxResult.success("库存数量不足！");
         }else {
             Double subtract = materialInventory.getQuantity() - weight;
             MaterialInventory materialInventory1 = new MaterialInventory();
@@ -154,7 +154,7 @@ public class MaterialCirculationServiceImpl implements IMaterialCirculationServi
 
 
         if(Double.valueOf(returnQuantity) > Double.valueOf(materialCirculation.getWeight())){
-            return AjaxResult.warn("退货重量大于取货重量！");
+            return AjaxResult.success("退货重量大于取货重量！");
         }
 
         // 查询当物料前库存数量

zkqy-custom-business/src/main/resources/mapper/business/OutboundRecordsMapper.xml

@@ -99,6 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="delFlag != null">del_flag,</if>
             <if test="taskProcessKey != null">task_process_key,</if>
             <if test="taskNodeKey != null">task_node_key,</if>
+            <if test="qtCodeNumber != null">qtCodeNumber,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="outboundNo != null">#{outboundNo},</if>
@@ -126,6 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="delFlag != null">#{delFlag},</if>
             <if test="taskProcessKey != null">#{taskProcessKey},</if>
             <if test="taskNodeKey != null">#{taskNodeKey},</if>
+            <if test="qtCodeNumber != null">#{qtCodeNumber},</if>
          </trim>
     </insert>
 

zkqy-ui/src/views/orderMange/index.vue

@@ -351,7 +351,7 @@
           <el-col :span="12">
             <el-form-item
               label-width="120px"
-              prop="saleDate"
+              prop="saleOrderEstimatedTime"
               label="预计下单时间:"
             >
               <el-date-picker
@@ -809,7 +809,7 @@ export default {
         saleNo: [
           {
             required: true,
-            message: "请输入销售单号",
+            message: "请输入合同号",
             trigger: "blur",
           },
           {
@@ -831,7 +831,7 @@ export default {
             trigger: "change",
           },
         ],
-        saleDate: [
+        saleOrderEstimatedTime: [
           {
             required: true,
             message: "请选择预计下单时间",
@@ -841,7 +841,7 @@ export default {
         saleLeadTime: [
           {
             required: true,
-            message: "请输入交货周期",
+            message: "请输入交货天数",
             trigger: "blur",
           },
         ],
@@ -1325,7 +1325,7 @@ export default {
         if (result.data) {
           callback();
         } else {
-          callback(new Error("订单号已存在"));
+          callback(new Error("合同号已存在"));
         }
       } else {
         callback(new Error("校验失败,请稍后再试"));