手持机部分

ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/domain/MydoJob.java

@@ -11,7 +11,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author ruoyi
  * @date 2025-05-23
  */
-public class MydoJob
+public class MydoJob extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
@@ -93,9 +93,7 @@ public class MydoJob
     @Excel(name = "任务类型",dictType = "in_or_out_type")
     private String inOrOut;
 
-    /** 开始时间 */
-    @Excel(name = "创建时间")
-    private String createTime;
+
 
     /** 开始时间 */
     @Excel(name = "开始时间")
@@ -146,13 +144,9 @@ public class MydoJob
         this.warehouseName = warehouseName;
     }
 
-    public String getCreateTime() {
-        return createTime;
-    }
 
-    public void setCreateTime(String createTime) {
-        this.createTime = createTime;
-    }
+
+
 
     public String getInOut() {
         return inOut;

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

@@ -12,6 +12,7 @@ import com.ruoyi.bas.basJobId.service.IBasJobIdService;
 import com.ruoyi.bas.cargoSpace.domain.BasCargoSpace;
 import com.ruoyi.bas.cargoSpace.service.IBasCargoSpaceService;
 import com.ruoyi.bas.taskNo.service.IBasTaskNoService;
+import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.in.stockindetail.domain.InStockinDetail;
@@ -74,6 +75,7 @@ public class MydoJobServiceImpl implements IMydoJobService {
      * @return 任务表
      */
     @Override
+    @DataScope(warehouseAlias = "bw")
     public List<MydoJob> selectMydoJobList(MydoJob mydoJob) {
         return mydoJobMapper.selectMydoJobList(mydoJob);
     }
@@ -86,7 +88,7 @@ public class MydoJobServiceImpl implements IMydoJobService {
      */
     @Override
     public int insertMydoJob(MydoJob mydoJob) {
-        mydoJob.setCreateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+        mydoJob.setCreateTime(new Date());
         mydoJob.setJobId(basJobIdService.getJobId("RK"));
         mydoJob.setTaskNo(Convert.toStr(basTaskNoService.getTaskNo("1")));
         return mydoJobMapper.insertMydoJob(mydoJob);
@@ -246,6 +248,15 @@ public class MydoJobServiceImpl implements IMydoJobService {
                 mydoJobDetail.setJobId(jobId);
                 List<MydoJobDetail> mydoJobDetails = mydoJobDetailService.selectMydoJobDetailList(mydoJobDetail);
                 for (MydoJobDetail detail : mydoJobDetails) {
+                    //修改库存的出库数量
+                    BasStock basStock = basStockService.selectBasStockByStockId(detail.getStockId());
+                    if (basStock != null) {
+                        BigDecimal outQuantity = Convert.toBigDecimal(basStock.getOutQuantity());
+                        BigDecimal substract = outQuantity.subtract(Convert.toBigDecimal(detail.getOutQuantity()));
+                        basStock.setOutQuantity(String.valueOf(substract));
+                        basStockService.updateBasStock(basStock);
+                    }
+                    //修改单据数量
                     OutStockoutDetail outStockoutDetail = outStockoutDetailService.selectOutStockoutDetailByStockoutDetailId(detail.getInOrOutDId());
                     if (outStockoutDetail != null) {
                         BigDecimal allotQuantity = outStockoutDetail.getAllotQuantity();
@@ -254,6 +265,12 @@ public class MydoJobServiceImpl implements IMydoJobService {
                         outStockoutDetailService.updateOutStockoutDetail(outStockoutDetail);
                     }
                 }
+                //修改货位状态
+                BasCargoSpace cargoSpace = basCargoSpaceService.selectBasCargoSpaceByCargoSpaceId(job.getCargoSpaceId());
+                if (cargoSpace != null) {
+                    cargoSpace.setStatus("1");
+                    basCargoSpaceService.updateBasCargoSpace(cargoSpace);
+                }
                 job.setStatus("5");
                 insertHistory(jobId);
             }

ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/domain/MydoJobDetail.java

@@ -125,6 +125,15 @@ public class MydoJobDetail extends BaseEntity
     private String pickQuantity;
     //额外字段
     private ExtraField extraField;
+    private String pickQuantityReal;
+
+    public String getPickQuantityReal() {
+        return pickQuantityReal;
+    }
+
+    public void setPickQuantityReal(String pickQuantityReal) {
+        this.pickQuantityReal = pickQuantityReal;
+    }
 
     public String getPickQuantity() {
         return pickQuantity;