手持功能初版

acs/nladmin-system/nlsso-server/src/main/resources/config/application-prod.yml

@@ -7,7 +7,7 @@ spring:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
       #      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:stand_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
-      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:cw_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
+      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:gc_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
       username: ${DB_USER:root}
       #      password: ${DB_PWD:Root.123456}
       password: ${DB_PWD:123456}

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/controller/PdaController.java

@@ -36,32 +36,46 @@ public class PdaController {
     private PdaService pdaService;
 
 
-    @PostMapping("/outStruct/outSave")
+    @PostMapping("/yclck")
-    @Log("涂板线下料")
+    @Log("原材料出库")
-    @ApiOperation("涂板线下料")
+    @ApiOperation("原材料出库")
-    public ResponseEntity<Object> outSave(@RequestBody JSONObject param){
+    public ResponseEntity<Object> yclck(@RequestBody JSONObject param){
-        return new ResponseEntity<>(pdaService.outSave(param), HttpStatus.OK);
+        return new ResponseEntity<>(pdaService.yclck(param), HttpStatus.OK);
     }
 
-    @PostMapping("/callingEmpty")
+    @PostMapping("/hwcl")
-    @Log("涂板线叫空架")
+    @Log("回温出料")
-    @ApiOperation("涂板线叫空架")
+    @ApiOperation("回温出料")
-    public ResponseEntity<Object> callingEmpty(@RequestBody JSONObject param){
+    public ResponseEntity<Object> hwcl(@RequestBody JSONObject param){
-        return new ResponseEntity<>(pdaService.callingEmpty(param), HttpStatus.OK);
+        return new ResponseEntity<>(pdaService.hwcl(param), HttpStatus.OK);
     }
 
-    @PostMapping("/cleanVehicle")
+    @PostMapping("/fbccl")
-    @Log("清空物料信息")
+    @Log("废包材处理")
-    @ApiOperation("清空物料信息")
+    @ApiOperation("废包材处理")
-    public ResponseEntity<Object> cleanVehicle(@RequestBody JSONObject param){
+    public ResponseEntity<Object> fbccl(@RequestBody JSONObject param){
-        return new ResponseEntity<>(pdaService.cleanVehicle(param), HttpStatus.OK);
+        return new ResponseEntity<>(pdaService.fbccl(param), HttpStatus.OK);
     }
 
-    @PostMapping("/callingMaterialTask")
+    @PostMapping("/ktphs")
-    @Log("包片机叫料")
+    @Log("空托盘回收")
-    @ApiOperation("包片机叫料")
+    @ApiOperation("空托盘回收")
-    public ResponseEntity<Object> callingMaterialTask(@RequestBody JSONObject param){
+    public ResponseEntity<Object> ktphs(@RequestBody JSONObject param){
-        return new ResponseEntity<>(pdaService.callingMaterialTask(param), HttpStatus.OK);
+        return new ResponseEntity<>(pdaService.ktphs(param), HttpStatus.OK);
+    }
+
+    @PostMapping("/ktpck")
+    @Log("空托盘出库")
+    @ApiOperation("空托盘出库")
+    public ResponseEntity<Object> ktpck(@RequestBody JSONObject param){
+        return new ResponseEntity<>(pdaService.ktpck(param), HttpStatus.OK);
+    }
+
+    @PostMapping("/zpjb")
+    @Log("组盘解绑")
+    @ApiOperation("组盘解绑")
+    public ResponseEntity<Object> zpjb(@RequestBody JSONObject param){
+        return new ResponseEntity<>(pdaService.zpjb(param), HttpStatus.OK);
     }
 
 }

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/PdaService.java

@@ -9,11 +9,15 @@ import org.nl.wms.pda.service.dao.vo.PdaResponseVo;
  * @Date: 2023/8/1
  */
 public interface PdaService {
-    PdaResponseVo outSave(JSONObject param);
+    PdaResponseVo yclck(JSONObject param);
 
-    PdaResponseVo callingEmpty(JSONObject param);
+    PdaResponseVo hwcl(JSONObject param);
 
-    PdaResponseVo cleanVehicle(JSONObject param);
+    PdaResponseVo fbccl(JSONObject param);
 
-    PdaResponseVo callingMaterialTask(JSONObject param);
+    PdaResponseVo ktphs(JSONObject param);
+
+    PdaResponseVo ktpck(JSONObject param);
+
+    PdaResponseVo zpjb(JSONObject param);
 }

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java

@@ -44,22 +44,15 @@ public class PdaServiceImpl implements PdaService {
     private AcsToWmsService acsToWmsService;
 
     @Override
-    public PdaResponseVo outSave(JSONObject param) {
+    public PdaResponseVo yclck(JSONObject param) {
-        param.put("device_code",param.getString("point_code"));
+        param.put("request_medthod_code","YCLCKTask");
-        if(!param.getString("point_code").startsWith("TBX")){
+        param.put("request_medthod_name","原材料出库");
-            throw new BadRequestException("非涂板线禁止叫料！");
-        }
-        if (!param.getString("point_code").endsWith("01")){
-            throw new BadRequestException("只有下料位才允许下料！");
-        }
-        param.put("request_medthod_code","MJXLTask");
-        param.put("request_medthod_name","涂板线满架下料");
         acsToWmsService.acsApply(param);
-        return PdaResponseVo.pdaResultOk("涂板线满架下料请求成功");
+        return PdaResponseVo.pdaResultOk("原材料出库成功");
     }
 
     @Override
-    public PdaResponseVo callingEmpty(JSONObject param) {
+    public PdaResponseVo hwcl(JSONObject param) {
         param.put("device_code",param.getString("point_code"));
         if(!param.getString("point_code").startsWith("TBX")){
             throw new BadRequestException("非涂板线禁止补空架！");
@@ -71,7 +64,7 @@ public class PdaServiceImpl implements PdaService {
     }
 
     @Override
-    public PdaResponseVo cleanVehicle(JSONObject param) {
+    public PdaResponseVo fbccl(JSONObject param) {
         //根据载具编码寻找点位，并且将它更新掉
         String vehicleCode=param.getString("vehicle_code");
         SchBaseVehiclematerialgroup groupEntity = vehiclematerialgroupService.getOne(new LambdaQueryWrapper<SchBaseVehiclematerialgroup>()
@@ -94,7 +87,31 @@ public class PdaServiceImpl implements PdaService {
         return PdaResponseVo.pdaResultOk("清空物料信息请求成功");
     }
     @Override
-    public PdaResponseVo callingMaterialTask(JSONObject param) {
+    public PdaResponseVo ktphs(JSONObject param) {
+        if(!param.getString("point_code").startsWith("BP")){
+            throw new BadRequestException("非包片机禁止叫料！");
+        }
+        param.put("device_code",param.getString("point_code"));
+        param.put("request_medthod_code","BPSLTask");
+        param.put("request_medthod_name","包片上料");
+        acsToWmsService.acsApply(param);
+        return PdaResponseVo.pdaResultOk("呼叫物料请求成功");
+    }
+
+    @Override
+    public PdaResponseVo ktpck(JSONObject param) {
+        if(!param.getString("point_code").startsWith("BP")){
+            throw new BadRequestException("非包片机禁止叫料！");
+        }
+        param.put("device_code",param.getString("point_code"));
+        param.put("request_medthod_code","BPSLTask");
+        param.put("request_medthod_name","包片上料");
+        acsToWmsService.acsApply(param);
+        return PdaResponseVo.pdaResultOk("呼叫物料请求成功");
+    }
+
+    @Override
+    public PdaResponseVo zpjb(JSONObject param) {
         if(!param.getString("point_code").startsWith("BP")){
             throw new BadRequestException("非包片机禁止叫料！");
         }

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/POINTTask.java

@@ -70,8 +70,6 @@ public class POINTTask extends AbstractTask {
         SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
                 .eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE));
         for (SchBaseTask task : tasks) {
-            String extGroupData = task.getExt_group_data();
-            JSONObject jsonObject = JSONObject.parseObject(extGroupData);
 
             task.setTask_status(TaskStatus.CREATED.getCode());
             task.setRemark("");

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLRKTask.java

@@ -178,6 +178,7 @@ public class YCLRKTask extends AbstractTask {
             endPointObj.setVehicle_qty(1);
             pointService.update(endPointObj);
             // 要把数据存到组盘表 -> 改造公共方法，返回id
+            //todo 组盘表需要关联外部mes晶棒数据，一对多
             SchBaseVehiclematerialgroup groupEntity = new SchBaseVehiclematerialgroup();
             groupEntity.setGroup_id(IdUtil.getSnowflake(1, 1).nextIdStr());
             groupEntity.setCreate_id("2");