Browse Source

设置点位

laoyao 3 years ago
parent
commit
c1234127ec

+ 5 - 0
imcs-admin-boot/imcs-authority-server/src/main/resources/application-test.yml

@@ -25,6 +25,11 @@ zuihou:
     isNotWrite: false
   file:
     remoteInputDataPath: smb://SOFLEX-PCS:SOFLEX-PCS@192.168.0.2/SOFLEX_PCS_iGen_CASC1_INPUT/ERP_DATA/
+  smb:
+    userName: measuring
+    password: Imcs@123456
+    fileIp: 192.168.170.23
+    filePath: smb://192.168.170.23/measuring/
   swagger:
     # 正式环境用nginx代理,为了保持和cloud版本一致的URL,特意调整
     docket:

+ 3 - 0
imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/WorkpieceService.java

@@ -58,4 +58,7 @@ public interface WorkpieceService extends SuperService<TWorkpiece> {
     public List<Tray>traylist();
 
 
+    public void setWorkPieceStock(Long taskNodeId,String targetStorgeId);
+
+
 }

+ 3 - 0
imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/TaskNodeServiceImpl.java

@@ -1460,6 +1460,9 @@ public class TaskNodeServiceImpl extends SuperServiceImpl<TaskNodeMapper, TaskNo
         String srcStorgeId = callBackJson.getString("srcPosition");
         String targetStorgeId = callBackJson.getString("targetPostion");
 
+        //更新目标位置
+        workpieceService.setWorkPieceStock(taskNode.getId(),targetStorgeId);
+
         if (DemoLineConstant.DEMOLINE_STOCK_TYPE_METERIAL_RK.equals(stockType)) {
             List<BomProcedureMeterial> meterialList = bomProcedureMeterialService.list(Wraps.<BomProcedureMeterial>lbQ().eq(BomProcedureMeterial::getId, task.getProcedureMeterialId()));
             if (meterialList != null && meterialList.size() > 0) {//只有入库

+ 12 - 0
imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/WorkpieceServiceImpl.java

@@ -320,4 +320,16 @@ public class WorkpieceServiceImpl extends SuperServiceImpl<WorkpieceMapper, TWor
         BaseContextHandler.setTenant("0000");
         return trayService.list();
     }
+
+    @Override
+    public void setWorkPieceStock(Long taskNodeId,String targetStorgeId) {
+        List<TWorkpiece>list = baseMapper.selectList(Wraps.<TWorkpiece>lbQ().eq(TWorkpiece::getTaskNodeId,taskNodeId));
+        if(CollectionUtil.isNotEmpty(list)){
+            TWorkpiece tWorkpiece = list.get(0);
+            Storge storge = storgeMapper.selectById(targetStorgeId);
+            tWorkpiece.setStorgeId(Long.parseLong(targetStorgeId));
+            tWorkpiece.setPointId(storge.getPointId());
+            baseMapper.updateAllById(tWorkpiece);
+        }
+    }
 }