盘点入库出库字段修改

ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java

@@ -275,6 +275,7 @@ public class MydoJobServiceImpl implements IMydoJobService {
                         BasStock stockByInStockinDetail = getStockByInStockinDetail(mydoJobDetail, mydoJob, "2");
                         stockByInStockinDetail.setSpare7("1");
                         stockByInStockinDetail.setBackDate(DateUtil.formatDateTime(DateUtil.date()));
+                        stockByInStockinDetail.setInDate(mydoJobDetail.getInDate());
                         list.add(stockByInStockinDetail);
                         //修改异常记录中的库存id
                         CheckDifferenceRecord checkDifferenceRecord = first.get();
@@ -319,12 +320,14 @@ public class MydoJobServiceImpl implements IMydoJobService {
             if (CollUtil.isNotEmpty(mydoJobDetails)) {
                 List<BasStock> list = new ArrayList<>();
                 for (MydoJobDetail mydoJobDetail : mydoJobDetails) {
-                    //if ("2".equals(mydoJob.getInOrOut()) || "3".equals(mydoJob.getInOrOut())) {
+                    if ("1".equals(mydoJob.getInOrOut()) ) {
-                    //修改单据实际数量
+                        //修改单据实际数量
-                    String inOrOutDId = mydoJobDetail.getInOrOutDId();
+                        String inOrOutDId = mydoJobDetail.getInOrOutDId();
-                    InStockinDetail inStockinDetail = inStockinDetailService.selectInStockinDetailByStockinDetailId(inOrOutDId);
+                        InStockinDetail inStockinDetail = inStockinDetailService.selectInStockinDetailByStockinDetailId(inOrOutDId);
-                    inStockinDetail.setAssignNum(Convert.toStr(Convert.toBigDecimal(inStockinDetail.getAssignNum()).add(Convert.toBigDecimal(mydoJobDetail.getInQuantity()))));
+                        inStockinDetail.setAssignNum(Convert.toStr(Convert.toBigDecimal(inStockinDetail.getAssignNum()).add(Convert.toBigDecimal(mydoJobDetail.getInQuantity()))));
-                    inStockinDetailService.updateInStockinDetail(inStockinDetail);
+                        inStockinDetailService.updateInStockinDetail(inStockinDetail);
+                    }
+
                     //}
                     //正常库存
                     BasStock stockByInStockinDetail = getStockByInStockinDetail(mydoJobDetail, mydoJob, "1");

ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java

@@ -116,11 +116,12 @@ public class PdaServiceImp implements PdaService {
     //@Transactional(rollbackFor = Exception.class)
     public AjaxResult checkMakeSure(TrayCodeMakeSure trayCodeMakeSure) {
 
-        MydoJob mydoJob = new MydoJob();
+        MydoJob mydoJob = mydoJobService.selectMydoJobByTrayCode(trayCodeMakeSure.getTrayCode());
-        mydoJob.setExitId(trayCodeMakeSure.getExitId());
+        if (mydoJob == null){
-        mydoJob.setStatus("3");
+            return AjaxResult.error("该托盘没有盘点作业，请检查");
-        mydoJob.setInOrOut("26");
+        }
-        List<MydoJobDetail> mydoJobDetails = mydoJobDetailService.selectPdMydoJobDetailListByExit(mydoJob);
+
+        List<MydoJobDetail> mydoJobDetails = mydoJobDetailService.selectMydoJobDetailListByJobId(mydoJob.getJobId());
         if(mydoJobDetails.isEmpty()){
             return AjaxResult.error("该物料没有盘点出库作业，请检查");
         }
@@ -129,13 +130,13 @@ public class PdaServiceImp implements PdaService {
         if (CollUtil.isNotEmpty(mydoJobDetailList)) {
             boolean flag = mydoJobDetailList.stream().anyMatch(x -> StrUtil.isEmpty(x.getStockId()) && "0".equals(x.getInQuantity()));
             if (flag) {
-                return AjaxResult.warn(MessageUtils.message("warn.message8"));
+                return AjaxResult.warn("新增物料数量不能为空！");
             }
             for (MydoJobDetail mydoJobDetail : mydoJobDetailList) {
                 //插入盘点提交表
                 CheckCommitRecord checkCommitRecord = new CheckCommitRecord();
                 checkCommitRecord.setQuantity(mydoJobDetail.getInQuantity());
-                checkCommitRecord.setTrayCode(mydoJobDetails.get(0).getTrayCode());
+                checkCommitRecord.setTrayCode(mydoJob.getTrayCode());
                 checkCommitRecord.setStockId(mydoJobDetail.getStockId());
                 checkCommitRecord.setSpare1(mydoJobDetail.getInOrOutDId());
                 checkCommitRecord.setSpare2(mydoJobDetail.getProductId());
@@ -145,7 +146,7 @@ public class PdaServiceImp implements PdaService {
             }
         }
         HashMap<String, Object> map = new HashMap<>();
-        map.put("v_tray_code", mydoJobDetails.get(0).getTrayCode());
+        map.put("v_tray_code", mydoJob.getTrayCode());
         pdaMapper.checkMakeSure(map);
         //iToWcsService.pushInMydoJob();
         String result = map.get("v_result").toString();

ruoyi-admin/src/main/resources/mapper/check/CheckDifferenceRecordMapper.xml

@@ -25,13 +25,6 @@
         <result property="warehouseName" column="warehouse_name"/>
         <association property="extraField" javaType="ExtraField">
             <result property="productId" column="product_id"/>
-            <result property="materialDesc" column="product_name"/>
-            <result property="englishDesc" column="englishDesc"/>
-            <result property="length" column="length"/>
-            <result property="width" column="width"/>
-            <result property="height" column="height"/>
-            <result property="volume" column="volume"/>
-            <result property="netWeight" column="netWeight"/>
         </association>
     </resultMap>
 

ruoyi-admin/src/main/resources/mapper/in/InStockinDetailFinishMapper.xml

@@ -91,9 +91,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectInStockinDetailFinishVo">
         select
             isd.stockin_detail_id, isd.stockin_guid, isd.stockin_id, isd.lot_no, isd.product_guid,
-            isd.product_id, isd.quantity, isd.quantity_x, isd.quantity_j, isd.price, isd.cargo_no, isd.remark,
+            isd.product_id, isd.quantity, isd.quantity_x, isd.quantity_j, isd.price, bp.cargo_no, isd.remark,
             isd.assign_num, isd.assign_num_x, isd.assign_num_j, isd.print_date, isd.stock_status,
-            isd.supplier_id, isd.customer_id, isd.unit, isd.spec, isd.spare1, isd.spare2, isd.spare3, isd.spare4,
+            isd.supplier_id, isd.customer_id, bp.unit, bp.spec, isd.spare1, isd.spare2, isd.spare3, isd.spare4,
             isd.spare5, isd.spare6, isd.scan_num, isd.scan_num_x, isd.scan_num_j,
             bp.product_name,
             isd.spare7,isd.spare8,isd.spare9,bs.supplier_name

ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml

@@ -57,9 +57,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectInStockinDetailVo">
         select
             isd.stockin_detail_id, isd.stockin_guid, isd.stockin_id, isd.lot_no, isd.product_guid,
-            isd.product_id, isd.quantity, isd.quantity_x, isd.quantity_j, isd.price, isd.cargo_no, isd.remark,
+            isd.product_id, isd.quantity, isd.quantity_x, isd.quantity_j, isd.price, bp.cargo_no, isd.remark,
             isd.assign_num, isd.assign_num_x, isd.assign_num_j, isd.print_date, isd.stock_status,
-            isd.supplier_id, isd.customer_id, isd.unit, isd.spec, isd.spare1, isd.spare2, isd.spare3, isd.spare4,
+            isd.supplier_id, isd.customer_id, bp.unit, bp.spec, isd.spare1, isd.spare2, isd.spare3, isd.spare4,
             isd.spare5, isd.spare6, isd.scan_num, isd.scan_num_x, isd.scan_num_j,
             bp.product_name,
             isd.spare7,isd.spare8,isd.spare9,bs.supplier_name

ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml

@@ -218,11 +218,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
     <insert id="insertBasStockList">
         INSERT INTO bas_stock
-            (stock_id,cargo_space_id,stock_status,product_status,lot_no,in_date,back_date,product_guid,quantity,job_id,tray_code,out_quantity,stockin_detail_id,stockin_id,in_type,in_class_id,warehouse_id,stacking_id,spare1,spare2,spare3,spare4,spare5,spare6,product_id,product_name,voltage,power,phase,net_weight,gross_weight,distribution,model,order_id,spare7)
+            (stock_id,cargo_space_id,stock_status,product_status,lot_no,in_date,back_date,product_guid,quantity,job_id,tray_code,out_quantity,stockin_detail_id,stockin_id,in_type,in_class_id,warehouse_id,stacking_id,spare1,spare2,spare3,spare4,spare5,spare6,product_id,product_name,voltage,power,phase,net_weight,gross_weight,distribution,model,order_id,spare7,spare8)
         VALUES
             <foreach collection="list" item="item" separator=",">
                 (#{item.stockId},#{item.cargoSpaceId},#{item.stockStatus},#{item.productStatus},#{item.lotNo},#{item.inDate},#{item.backDate},#{item.productGuid},#{item.quantity},#{item.jobId},#{item.trayCode},#{item.outQuantity},#{item.stockinDetailId},#{item.stockinId},#{item.inType},#{item.inClassId},#{item.warehouseId},#{item.stackingId},#{item.spare1},#{item.spare2},#{item.spare3},#{item.spare4},#{item.spare5},#{item.spare6},#{item.productId}
-                ,#{item.productName},#{item.voltage},#{item.power},#{item.phase},#{item.netWeight},#{item.grossWeight},#{item.distribution},#{item.model},#{item.orderId},#{item.spare7})
+                ,#{item.productName},#{item.voltage},#{item.power},#{item.phase},#{item.netWeight},#{item.grossWeight},#{item.distribution},#{item.model},#{item.orderId},#{item.spare7},#{item.spare8})
             </foreach>
     </insert>
 

ruoyi-ui/src/views/check/job/in/index.vue

@@ -250,7 +250,7 @@ import {listWarehouse} from "@/api/bas/warehouse";
 
 export default {
   name: "MydoJob",
-  dicts: ['execution_phase_type', 'check_in_job_type', 'on_line_type', 'mydo_job_status'],
+  dicts: ['execution_phase_type', 'check_in_job_type', 'on_line_type', 'mydo_job_status', 'sys_yes_no', 'product_type', 'quality_type', 'turnover_type', 'sys_yes_no', 'account_type', 'origin_type', 'purpose_type',],
   data() {
     return {
       warehouseOptions:[],
@@ -456,7 +456,7 @@ export default {
       }else if (row.type === 'completed'){
         //手动完成
         manualCompleted(data).then(response => {
-          this.$modal.msgSuccess(this.$t('checkJobIn.operaSuccess'));
+          this.$modal.msgSuccess('操作成功');
           this.getList();
         })
       }

ruoyi-ui/src/views/check/job/out/index.vue

@@ -144,7 +144,7 @@
         </template>
       </el-table-column>
 <!--      <el-table-column label="部门" align="left" prop="departmentName" />-->
-<!--      <el-table-column label="托盘码" align="left" prop="trayCode" />-->
+      <el-table-column label="托盘码" align="left" prop="trayCode" />
       <el-table-column label="货位" align="left" prop="cargoSpaceName" />
 <!--      <el-table-column label="订单号" align="right" prop="lineId" />-->
 <!--      <el-table-column label="执行阶段" align="left" prop="executionPhase">
@@ -175,6 +175,7 @@
       <el-table-column label="任务ID" align="left" prop="jobId" width="140" />
       <el-table-column label="单据ID" align="left" prop="inOrOutId" width="150" />
       <el-table-column label="子单据ID" align="left" prop="inOrOutDId" width="160" />
+      <el-table-column label="库存ID" align="left" prop="stockId" width="160" />
       <el-table-column label="物料编码" align="left" prop="productId" width="140" />
       <el-table-column label="物料名称" align="left" prop="productName" />
       <el-table-column label="批号" align="left" prop="lotNo" />