Merge remote-tracking branch 'origin/master'

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/edgeLibrary/StockInfoMapper.xml

@@ -77,7 +77,7 @@
     </select>
 
     <select id="getGoodsListBystorgeId" resultMap="BaseResultMap" parameterType="map">
-        select a.*,b.categoryDesc,b.name as brandName,b.no as brandNo,b.specification,0 as lockNum,0 as availableNum,s.`no` as storgeNo, n.target_resource_id, p.name as target_name from imcs_s_stock_info a
+        select a.*,b.categoryDesc,b.name as brandName,b.no as brandNo,b.specification,0 as lockNum,0 as availableNum,s.`no` as storgeNo, n.target_resource_id, p.name as target_name, s.point_id as pointId from imcs_s_stock_info a
         left join view_stock_goods b on a.goods_id  = b.id
         left join imcs_s_storge s on a.storge_id = s.id
         left join imcs_t_task_node n on n.complete_batch_no = a.complete_batch_no and n.exe_status='2'

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/productionResourceCenter/StationUserController.java

@@ -8,7 +8,10 @@ import com.github.zuihou.authority.entity.auth.StationUserLoginInfo;
 import com.github.zuihou.authority.entity.common.DictionaryItem;
 import com.github.zuihou.base.R;
 import com.github.zuihou.base.controller.SuperController;
+import com.github.zuihou.business.edgeLibrary.entity.StockInfo;
+import com.github.zuihou.business.edgeLibrary.entity.Storge;
 import com.github.zuihou.business.edgeLibrary.service.StockInfoService;
+import com.github.zuihou.business.edgeLibrary.service.StorgeService;
 import com.github.zuihou.business.operationManagementCenter.dto.OrderUpdateDTO;
 import com.github.zuihou.business.operationManagementCenter.entity.Order;
 import com.github.zuihou.business.operationManagementCenter.entity.OrderTask;
@@ -19,8 +22,10 @@ import com.github.zuihou.business.operationManagementCenter.service.OrderTaskSer
 import com.github.zuihou.business.operationManagementCenter.service.PlanService;
 import com.github.zuihou.business.productionReadyCenter.entity.BBom;
 import com.github.zuihou.business.productionReadyCenter.entity.BomProcedureMeterial;
+import com.github.zuihou.business.productionReadyCenter.entity.CuttingTool;
 import com.github.zuihou.business.productionReadyCenter.entity.MMeterialReceiveLog;
 import com.github.zuihou.business.productionReadyCenter.service.BBomService;
+import com.github.zuihou.business.productionReadyCenter.service.CuttingToolService;
 import com.github.zuihou.business.productionReadyCenter.service.MMeterialReceiveLogService;
 import com.github.zuihou.business.productionResourceCenter.dao.ProductionresourceBizMapper;
 import com.github.zuihou.business.productionResourceCenter.dao.StationUserMapper;
@@ -28,13 +33,18 @@ import com.github.zuihou.business.productionResourceCenter.dto.StationUserPageDT
 import com.github.zuihou.business.productionResourceCenter.dto.StationUserSaveDTO;
 import com.github.zuihou.business.productionResourceCenter.dto.StationUserUpdateDTO;
 import com.github.zuihou.business.productionResourceCenter.entity.Productionresource;
+import com.github.zuihou.business.productionResourceCenter.entity.ProductionresourcePosition;
 import com.github.zuihou.business.productionResourceCenter.entity.StationUser;
+import com.github.zuihou.business.productionResourceCenter.service.ProductionresourcePositionService;
 import com.github.zuihou.business.productionResourceCenter.service.StationUserService;
+import com.github.zuihou.common.constant.CodeRuleModule;
 import com.github.zuihou.common.util.DateUtil;
 import com.github.zuihou.common.util.StringUtil;
 import com.github.zuihou.database.mybatis.conditions.Wraps;
 import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
+import com.github.zuihou.database.mybatis.conditions.update.LbuWrapper;
 import com.github.zuihou.log.annotation.SysLog;
+import com.github.zuihou.tenant.service.CodeRuleService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -80,6 +90,12 @@ public class StationUserController extends SuperController<StationUserService, L
     private StockInfoService stockInfoService;
     @Autowired
     private MMeterialReceiveLogService meterialReceiveLogService;
+    @Autowired
+    private CuttingToolService cuttingToolService;
+    @Autowired
+    private ProductionresourcePositionService productionresourcePositionService;
+    @Autowired
+    private CodeRuleService codeRuleService;
 
     @Autowired
     private BBomService bBomService;
@@ -187,6 +203,39 @@ public class StationUserController extends SuperController<StationUserService, L
         return success(productionresources);
     }
 
+    @ApiOperation(value = "查询刀具上下料站库位", notes = "查询刀具上下料站库位")
+    @GetMapping("/getCutToolStation")
+    public R getCutToolStation(@RequestParam(value = "zoneCode", required = true) String zoneCode) {
+        List<Productionresource> cutToolList = productionresourceBizMapper.selectList(new LbqWrapper<Productionresource>().eq(Productionresource::getStatus, "1").eq(Productionresource::getOnlineStatus, "1").like(Productionresource::getCode, zoneCode).like(Productionresource::getName, "刀具上下料"));
+        return success(cutToolList);
+    }
+
+    @ApiOperation(value = "查询刀具上下料站库位信息", notes = "查询刀具上下料站库位信息")
+    @GetMapping("/getCutToolStockInfo")
+    public R getCutToolStockInfo(@RequestParam(value = "deviceId", required = true) String deviceId) {
+        ProductionresourcePosition productionresourcePosition = productionresourcePositionService.getOne(new LbqWrapper<ProductionresourcePosition>().eq(ProductionresourcePosition::getResourceId, deviceId).eq(ProductionresourcePosition::getStatus, "0").last("LIMIT 1"));
+        Map map = new HashMap();
+        map.put("storgeId", productionresourcePosition.getStorgeId());
+        List<StockInfo> stockInfos = stockInfoService.getGoodsListBystorgeId(map);
+        return success(stockInfos);
+    }
+
+    @ApiOperation(value = "新增刀具上料库位信息", notes = "新增刀具上料库位信息")
+    @PostMapping("/addCutToolStockInfo")
+    public R addCutToolStockInfo(@RequestBody Map<String,Object> model) {
+        if(!model.containsKey("RFID") || !model.containsKey("deviceId")) return R.fail("数据参数不全");
+        Long deviceId = Long.parseLong(model.get("deviceId").toString());
+        CuttingTool cuttingTool = cuttingToolService.getOne(new LbqWrapper<CuttingTool>().eq(CuttingTool::getCuttingToolNo, model.get("RFID").toString()).last("LIMIT 1"));
+        ProductionresourcePosition productionresourcePosition = productionresourcePositionService.getOne(new LbqWrapper<ProductionresourcePosition>().eq(ProductionresourcePosition::getResourceId, deviceId).eq(ProductionresourcePosition::getStatus, "0").last("LIMIT 1"));
+        StockInfo stockInfo = StockInfo.builder().goodsId(cuttingTool.getId()).specId(cuttingTool.getId()).num(1).goodsType("6").storgeId(productionresourcePosition.getStorgeId()).lockStatus("1").uniqueCode(codeRuleService.getBillCode(CodeRuleModule.CODE_RULE_UNIQUE)).build();
+        stockInfoService.save(stockInfo);
+        Map map = new HashMap();
+        map.put("storgeId", productionresourcePosition.getStorgeId());
+        List<StockInfo> stockInfos = stockInfoService.getGoodsListBystorgeId(map);
+        return success(stockInfos);
+    }
+
+
     @ApiOperation(value = "新增刀具取放任务", notes = "新增刀具取放任务")
     @PostMapping("/addCutToolTask")
     public R addCutToolTask(@RequestBody Map<String,Object> model) {

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/edgeLibrary/entity/StockInfo.java

@@ -203,6 +203,10 @@ public class StockInfo extends Entity<Long> {
     @TableField(exist = false)
     private String targetName;
 
+    @ApiModelProperty(value = "点位信息")
+    @TableField(exist = false)
+    private String pointId;
+
     @Builder
     public StockInfo(Long id, LocalDateTime createTime, Long createUser, LocalDateTime updateTime, Long updateUser, 
                     Long storgeId, String lockStatus, String goodsType, Long goodsId, Integer num, String completeBatchNo,