出库确认

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

@@ -5,6 +5,8 @@ import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.StrUtil;
 import com.ruoyi.bas.cargoSpace.domain.BasCargoSpace;
 import com.ruoyi.bas.cargoSpace.service.IBasCargoSpaceService;
+import com.ruoyi.bas.containerDetails.domain.BasContainerDetails;
+import com.ruoyi.bas.containerDetails.service.IBasContainerDetailsService;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.job.mydojob.domain.MydoJob;
 import com.ruoyi.job.mydojob.service.IMydoJobService;
@@ -48,6 +50,8 @@ public class PdaServiceImp implements PdaService{
     IInStockinDetailService inStockinDetailService;
     @Autowired
     ITrayMsgService trayMsgService;
+    @Autowired
+    private IBasContainerDetailsService basContainerDetailsService;
 
     /**
      * 空托盘入库
@@ -184,14 +188,32 @@ public class PdaServiceImp implements PdaService{
     public AjaxResult outMakeSure(TrayCodeMakeSure trayCodeMakeSure) {
         //修改拣选数量
         List<MydoJobDetail> mydoJobDetailList = trayCodeMakeSure.getMydoJobDetailList();
-        for (MydoJobDetail mydoJobDetail : mydoJobDetailList) {
+        if(CollUtil.isNotEmpty(mydoJobDetailList)){
-            MydoJobDetail mydoJobDetailOld = mydoJobDetailService.selectMydoJobDetailByJobDetailId(mydoJobDetail.getJobDetailId());
+            for (MydoJobDetail mydoJobDetail : mydoJobDetailList) {
-            BigDecimal oldPickQuantity = Convert.toBigDecimal(mydoJobDetailOld.getPickQuantity());
+                MydoJobDetail mydoJobDetailOld = mydoJobDetailService.selectMydoJobDetailByJobDetailId(mydoJobDetail.getJobDetailId());
-            BigDecimal newPickQuantity = Convert.toBigDecimal(mydoJobDetail.getPickQuantity());
+                BigDecimal oldPickQuantity = Convert.toBigDecimal(mydoJobDetailOld.getPickQuantity());
-            mydoJobDetail.setPickQuantity(oldPickQuantity.add(newPickQuantity).toString());
+                BigDecimal newPickQuantity = Convert.toBigDecimal(mydoJobDetail.getPickQuantity());
-            mydoJobDetailService.updateMydoJobDetail(mydoJobDetail);
+                mydoJobDetailOld.setPickQuantity(oldPickQuantity.add(newPickQuantity).toString());
-        }
+                mydoJobDetailService.updateMydoJobDetail(mydoJobDetailOld);
 
+                BasContainerDetails basContainerDetailsParam = new BasContainerDetails();
+                basContainerDetailsParam.setContainerId(trayCodeMakeSure.getContainerCode());
+                basContainerDetailsParam.setProductId(mydoJobDetailOld.getProductId());
+                List<BasContainerDetails> basContainerDetails = basContainerDetailsService.selectBasContainerDetailsList(basContainerDetailsParam);
+                if (CollUtil.isNotEmpty(basContainerDetails)){
+                    BasContainerDetails oldBasContainerDetails = basContainerDetails.get(0);
+                    oldBasContainerDetails.setQuantity(oldBasContainerDetails.getQuantity()+Convert.toLong(mydoJobDetail.getPickQuantity()));
+                    basContainerDetailsService.updateBasContainerDetails(oldBasContainerDetails);
+                }else {
+                    BasContainerDetails newBasContainerDetails = new BasContainerDetails();
+                    newBasContainerDetails.setContainerId(trayCodeMakeSure.getContainerCode());
+                    newBasContainerDetails.setProductId(mydoJobDetail.getProductId());
+                    newBasContainerDetails.setQuantity(Convert.toLong(mydoJobDetail.getPickQuantity()));
+                    basContainerDetailsService.insertBasContainerDetails(newBasContainerDetails);
+                }
+            }
+
+        }
         //查询当前任务是否已经全部拣选完成
         MydoJob mydoJobParam = new MydoJob();
         mydoJobParam.setTrayCode(trayCodeMakeSure.getTrayCode());

ruoyi-ui/src/views/system/role/index.vue

@@ -308,8 +308,17 @@
 </template>
 
 <script>
-import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role"
+import {
-import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu"
+  addRole,
+  changeRoleStatus,
+  dataScope,
+  delRole,
+  deptTreeSelect,
+  getRole,
+  listRole,
+  updateRole
+} from "@/api/system/role"
+import {roleMenuTreeselect, treeselect as menuTreeselect} from "@/api/system/menu"
 import {listWarehouse} from "@/api/bas/warehouse"
 
 export default {
@@ -436,9 +445,9 @@ export default {
         // let listMenu = response.data.map(item => {
         //     return this.$t(item.label); // 只提取翻译后的 label
         // });
-        const translatedData = this.translateMenuLabels(response.data);
+        console.log(response.data);
         // this.menuOptions = response.data
-        this.menuOptions = translatedData
+        this.menuOptions = this.translateMenuLabels(response.data)
       })
     },
     //@@@