现场调试修改 入库 出库 放货重新分配货位

ruoyi-admin/src/main/java/com/ruoyi/api/domain/RequestEnter.java

@@ -19,4 +19,6 @@ public class RequestEnter {
     private String roadwayId;
 
     private Integer height;
+
+    private Double weight;
 }

ruoyi-admin/src/main/java/com/ruoyi/api/domain/RequestEnterResponse.java

@@ -10,5 +10,5 @@ import lombok.NoArgsConstructor;
 public class RequestEnterResponse {
     private String cargoSpaceId;
     private String trayCode;
-    private String taskNo;
+    private String jobId;
 }

ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java

@@ -32,21 +32,22 @@ public class ToWcsServiceImpl implements IToWcsService {
     @Autowired
     private IAgvContainerTaskService agvContainerTaskService;
 
-    public static final String PUSH_OUT_MYDO_JOB = "http://localhost:8081/wcs2Wms/api/receiveOutMydoJob";
-    public static final String PUSH_IN_MYDO_JOB = "http://localhost:8081/wcs2Wms/api/receiveInMydoJob";
-    public static final String PUSH_AGV_MOVE_JOB = "http://localhost:8081/agv/api/receiveAgvMoveJob";
-    public static final String OUT_MYDOJOB_MS = "http://localhost:8081/wcs2Wms/api/outMydojobMakesure";
-    public static final String CANCEL_MYDOJOB = "http://localhost:8081/wcs2Wms/api/cancelMydoJob";
+    public static final String PUSH_OUT_MYDO_JOB = "http://localhost:10012/wcs2Wms/api/receiveOutMydoJob";
+    public static final String PUSH_IN_MYDO_JOB = "http://localhost:10012/wcs2Wms/api/receiveInMydoJob";
+    public static final String PUSH_AGV_MOVE_JOB = "http://localhost:10012/agv/api/receiveAgvMoveJob";
+    public static final String OUT_MYDOJOB_MS = "http://localhost:10012/wcs2Wms/api/outMydojobMakesure";
+    public static final String CANCEL_MYDOJOB = "http://localhost:10012/wcs2Wms/api/cancelMydoJob";
 
 
     @Override
-    //@Scheduled(fixedDelay=1500)
+    @Scheduled(fixedDelay=1500)
     public void pushOutMydoJob() {
         //查询所有未推送的料箱出库作业
         MydoJob mydoJobParam = new MydoJob();
         mydoJobParam.setStatus("1");
         List<String> list = new ArrayList<>();
         list.add("21");
+        list.add("23");
         list.add("26");
         mydoJobParam.setInOutIds(list);
         List<MydoJob> outMydoJobs = mydoJobService.selectMydoJobListApi(mydoJobParam);

ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java

@@ -157,6 +157,11 @@ public class ToWmsServiceImpl implements IToWmsService {
     public AjaxResult reAssign(ReMaterialParam reMaterialParam) {
         //重新分配货位
         MydoJob mydoJob = mydoJobService.selectMydoJobByJobId(reMaterialParam.getJobId());
+        //先标记原来货位有问题
+        String cargoSpaceId = mydoJob.getCargoSpaceId();
+        BasCargoSpace oldBasCargoSpace = basCargoSpaceService.selectBasCargoSpaceByCargoSpaceId(cargoSpaceId);
+        oldBasCargoSpace.setStatus("5");
+        basCargoSpaceService.updateBasCargoSpace(oldBasCargoSpace);
         String warehouseId = mydoJob.getWarehouseId();
         BasCargoSpace basCargoSpaceParam = new BasCargoSpace();
         basCargoSpaceParam.setWarehouseId(warehouseId);
@@ -198,6 +203,10 @@ public class ToWmsServiceImpl implements IToWmsService {
         if (requestEnter.getHeight()==0) {
             return AjaxResult.error("未检测到入库高度");
         }
+        /*if (requestEnter.getWeight() ==0){
+            return AjaxResult.error("未检测到入库重量");
+        }*/
+
         log.info("扫码内容{}，入库高度{}", requestEnter.getTrayCode(), requestEnter.getHeight());
 
         MydoJob param = new MydoJob();
@@ -211,8 +220,8 @@ public class ToWmsServiceImpl implements IToWmsService {
         MydoJob mydoJob = mydoJobs.get(0);
         if(StrUtil.isEmpty(mydoJob.getCargoSpaceId())){
             BasCargoSpace basCargoSpaceParam = new BasCargoSpace();
-            basCargoSpaceParam.setWarehouseId(mydoJob.getWarehouseId());
-            basCargoSpaceParam.setRoadwayId(mydoJob.getRoadwayId());
+            basCargoSpaceParam.setWarehouseId(requestEnter.getWarehouseId());
+            basCargoSpaceParam.setRoadwayId(requestEnter.getRoadwayId());
             if (requestEnter.getHeight()==1){
                 basCargoSpaceParam.setCargoHight("975");
             }else {
@@ -228,6 +237,7 @@ public class ToWmsServiceImpl implements IToWmsService {
             mydoJob.setStatus("3");
             mydoJob.setStartTime(DateUtil.formatDateTime(new Date()));
             mydoJob.setRoadwayId(requestEnter.getRoadwayId());
+            mydoJob.setLineId(Convert.toStr(requestEnter.getWeight()));
             mydoJobService.updateMydoJob(mydoJob);
 
             //修改货位状态为已分配

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

@@ -32,6 +32,7 @@ import com.ruoyi.pda.service.PdaService;
 import com.ruoyi.stock.stock.domain.BasStock;
 import com.ruoyi.stock.stock.mapper.BasStockMapper;
 import com.ruoyi.stock.stock.service.IBasStockService;
+import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -50,7 +51,7 @@ import java.util.*;
 @Service
 @Slf4j
 public class MydoJobServiceImpl implements IMydoJobService {
-    @Autowired
+    @Resource
     private MydoJobMapper mydoJobMapper;
     @Autowired
     private IBasJobIdService basJobIdService;
@@ -76,9 +77,9 @@ public class MydoJobServiceImpl implements IMydoJobService {
     private IToWcsService iToWcsService;
     @Autowired
     private ITransferBillCallbackService transferBillCallbackService;
-    @Autowired
+    @Resource
     private BasStockMapper basStockMapper;
-    @Autowired
+    @Resource
     private PdaMapper pdaMapper;
     @Autowired
     private ICheckDifferenceRecordService checkDifferenceRecordService;
@@ -429,6 +430,7 @@ public class MydoJobServiceImpl implements IMydoJobService {
         stock.setDistribution(mydoJobDetail.getSpare9());
         stock.setModel(mydoJobDetail.getUnit());
         stock.setOrderId(mydoJobDetail.getSpare6());
+        stock.setNetWeight(mydoJob.getLineId());
         return stock;
     }
 

ruoyi-admin/src/main/resources/application-druid.yml

@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:sqlserver://172.16.2.170:1433;databaseName=FT541-wms;encrypt=true;trustServerCertificate=true;
+                url: jdbc:sqlserver://127.0.0.1:1433;databaseName=FT541-wms;encrypt=true;trustServerCertificate=true;
                 username: sa
                 password: Flrd0914.
             # 从库数据源

ruoyi-admin/src/main/resources/application.yml

@@ -71,7 +71,7 @@ spring:
     # redis 配置
     redis:
       # 地址
-      host: 172.16.2.170
+      host: 127.0.0.1
       # 端口，默认为6379
       port: 6379
       # 数据库索引

ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml

@@ -182,12 +182,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM bas_cargo_space
         WHERE status = '1'
           and locked = 'N'
-        <if test="warehouseId != null">
             and warehouse_id = #{warehouseId}
-        </if>
-        <if test="roadwayId != null">
             and roadway_id = #{roadwayId}
-        </if>
         ORDER BY the_platoon, the_floor,the_column
     </select>
     <select id="selectBasCargoSpaceListByRoadway" parameterType="BasCargoSpace" resultMap="BasCargoSpaceResult">

ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailMapper.xml

@@ -370,7 +370,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                mjd.spec,
                mjd.unit,
                mj.tray_code,
-               mj.warehosue_id
+               mj.warehouse_id
 
         from mydo_job_detail mjd
          left join bas_product bp on mjd.product_id = bp.product_id