diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/domain/MydoJob.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/domain/MydoJob.java
index 7e3087f..3817969 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/domain/MydoJob.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/domain/MydoJob.java
@@ -129,6 +129,23 @@ public class MydoJob
private String inOut;
+
+ public String getDepartmentName() {
+ return departmentName;
+ }
+
+ public void setDepartmentName(String departmentName) {
+ this.departmentName = departmentName;
+ }
+
+ public String getWarehouseName() {
+ return warehouseName;
+ }
+
+ public void setWarehouseName(String warehouseName) {
+ this.warehouseName = warehouseName;
+ }
+
public String getCreateTime() {
return createTime;
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
index 8b9881f..ec7440b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
@@ -9,6 +9,8 @@ import java.util.List;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
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.core.domain.AjaxResult;
import com.ruoyi.common.utils.DateUtils;
@@ -50,6 +52,8 @@ public class MydoJobServiceImpl implements IMydoJobService {
private IBasStockService basStockService;
@Autowired
private IOutStockoutDetailService outStockoutDetailService;
+ @Autowired
+ private IBasCargoSpaceService basCargoSpaceService;
/**
@@ -188,6 +192,11 @@ public class MydoJobServiceImpl implements IMydoJobService {
basStockService.insertBasStockList(list);
mydoJob.setStatus("4");
updateMydoJob(mydoJob);
+ //修改货位
+ BasCargoSpace basCargoSpace = new BasCargoSpace();
+ basCargoSpace.setStatus("2");
+ basCargoSpace.setCargoSpaceId(job.getCargoSpaceId());
+ basCargoSpaceService.updateBasCargoSpace(basCargoSpace);
//插入历史表
insertHistory(mydoJob.getJobId());
}
@@ -202,7 +211,7 @@ public class MydoJobServiceImpl implements IMydoJobService {
stock.setStockStatus("1");
stock.setProductStatus("1");
stock.setLotNo(mydoJobDetail.getLotNo());
- stock.setInDate(DateUtils.getDate());
+ stock.setInDate(DateUtils.getTime());
stock.setProductGuid(mydoJobDetail.getProductGuid());
stock.setQuantity(mydoJobDetail.getInQuantity());
stock.setJobId(mydoJob.getJobId());
@@ -210,6 +219,11 @@ public class MydoJobServiceImpl implements IMydoJobService {
stock.setInClassId(mydoJob.getClassId());
stock.setWarehouseId(mydoJob.getWarehouseId());
stock.setStackingId(mydoJobDetail.getStackingId());
+ stock.setOutQuantity("0");
+ stock.setProductId(mydoJobDetail.getProductId());
+ stock.setStockinId(mydoJobDetail.getInOrOutId());
+ stock.setStockinDetailId(mydoJobDetail.getInOrOutDId());
+ stock.setInType(mydoJob.getInOrOut());
return stock;
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java
index 7d40702..e75c368 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java
@@ -184,7 +184,7 @@ public class PdaController extends BaseController {
}
/**
- * 出库确认
+ * 盘点出库确认
* @param trayCodeMakeSure 托盘信息
* @return
*/
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/domain/BasStock.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/domain/BasStock.java
index 083eb6b..25061ce 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/domain/BasStock.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/domain/BasStock.java
@@ -123,6 +123,16 @@ public class BasStock extends BaseEntity
//货位库存状态
private String cargoSpaceStockStatus;
+ private String productId;
+
+ public String getProductId() {
+ return productId;
+ }
+
+ public void setProductId(String productId) {
+ this.productId = productId;
+ }
+
public String getCargoSpaceStockStatus() {
return cargoSpaceStockStatus;
}
diff --git a/ruoyi-ui/src/views/check/job/in/index.vue b/ruoyi-ui/src/views/check/job/in/index.vue
index dbf1c3b..368a691 100644
--- a/ruoyi-ui/src/views/check/job/in/index.vue
+++ b/ruoyi-ui/src/views/check/job/in/index.vue
@@ -256,12 +256,12 @@
-
+
-
-
-
-
+
+
+
+
@@ -279,10 +279,10 @@
{{ parseTime(scope.row.finishTime, '{y}-{m}-{d}') }}
-
-
-
-
+
+
+
+
// 物料描述
// 英文描述
- // 箱号
- // 包装方式
+
+
// 净重
- // 总净重
- // 毛重
+
+