-- 下料目标库位分配修改

ruoyi-admin/src/main/java/com/ruoyi/init/StartService.java

@@ -40,10 +40,10 @@ public class StartService implements CommandLineRunner {
     @Override
     public void run(String... args) throws Exception {
         //自动下发任务
-        /*if (initTaskConfig.getAutoSend()) {
+        if (initTaskConfig.getAutoSend()) {
             Thread thread = new Thread(new AutoTaskThread(businessService));
             thread.start();
-        }*/
+        }
 
         //ndc下发
 /*        if (initTaskConfig.getAciService()) {

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

@@ -118,7 +118,7 @@ rfid:
 plc:
     plcList[0]:
         ip: 192.168.2.1
-        enable: false
+        enable: true
         name: packingMachine_Plc
         ePlcType: S200_SMART
         heartbeat:

warewms-ams/src/main/java/com/ruoyi/ams/business/BusinessServiceImpl.java

@@ -150,7 +150,7 @@ public class BusinessServiceImpl implements IBusinessService {
 
                     List<BaseLocationInfo> locationToList = baseLocationInfoMapper.selectSortedLocationLotattListByZoneIdListOrderBy(zoneIdListTo
                             , agvCallDTO.getWarehouseId(), hashMap, agvCall.getSku(), "inv.create_time");
-                    locationTo = this.zoneLocationAllocation(locationToList, "locationFrom", "PM_XL", asnSoStrategy, token);
+                    locationTo = this.zoneLocationAllocation(locationToList, "locationTo", "PM_XL", asnSoStrategy, token);
                 }else{
                     locationTo = baseLocationInfoService.selectBaseLocationInfoByIdOrNo(paramLocationTo,Constant.WAREHOUSE_ID);
                 }

warewms-ams/src/main/java/com/ruoyi/ams/tm/service/impl/TsTaskServiceImpl.java

@@ -164,9 +164,9 @@ public class TsTaskServiceImpl implements ITsTaskService {
                     wcsTask.setRemark("任务开始执行!");
                     break;
                 case 2:
-                    if (wcsTask.getState() == 3 || wcsTask.getState() == 4) {
-                        log.info("任务未取货，不能直接完成！" + wcsTask.getTaskNo());
-                        return TsTaskStateResponse.error("任务未取货，不能直接完成！" ,"");
+                    if (wcsTask.getState() != 4 || wcsTask.getState() != 6) {
+                        log.info("任务未取卸货，不能直接完成！" + wcsTask.getTaskNo()+"——"+ wcsTask.getTaskNo());
+                        return TsTaskStateResponse.error("任务未取卸货，不能直接完成！" ,"");
                     }
                     if (wcsTask.getState() == 6) {
                         return TsTaskStateResponse.success("执行成功！" ,"");