Merge branch 'master' of http://42.192.7.176:3000/suojin/jonhon-mes-svr into liweidong

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataProduceClient.java

@@ -19,8 +19,7 @@ import java.util.Map;
  * @author Chill
  */
 @FeignClient(
-	value = LauncherConstant.APPLICATION_ERP_DATA_NAME,
-	fallback = IErpDataProduceClientFallback.class
+	value = LauncherConstant.APPLICATION_ERP_DATA_NAME
 )
 public interface IErpDataProduceClient {
 
@@ -37,7 +36,7 @@ public interface IErpDataProduceClient {
 	 * 缺件申报-通过零件号获取批次号
      */
 	@GetMapping(QUERY_BATCH)
-	R<QueryBatchVO> queryBatch(String partCode);
+	R<QueryBatchVO> queryBatch(@RequestParam("partCode") String partCode);
 
 	/**
 	 * 返工订单
@@ -49,13 +48,13 @@ public interface IErpDataProduceClient {
 	 * 获取产品区域
 	 */
 	@GetMapping(PRODUCT_APP_AREA)
-	R<Map<String, String>> getProductAppareaByPartCode(String partCode);
+	R<Map<String, String>> getProductAppareaByPartCode(@RequestParam("partCode") String partCode);
 
 	/**
 	 * 获取产品版本
 	 */
 	@GetMapping(VERSION)
-	R<String> getVersionByPartCode(String partCode);
+	R<String> getVersionByPartCode(@RequestParam("partCode") String partCode);
 
 	/**
 	 * 获取保管员

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java

@@ -561,6 +561,24 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 			// 构建生产订单信息并保存
 			JSONObject yieldJson = jsonItem.getJSONObject("order");
 			YieldOrder yieldOrder = JSON.parseObject(JSON.toJSONString(yieldJson), YieldOrder.class);
+			if(yieldOrder.getYieldType() == 1){
+				yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_1.getCode());
+			}
+			if(yieldOrder.getYieldType() == 2){
+				yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_2.getCode());
+			}
+			if(yieldOrder.getYieldType() == 3){
+				yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_3.getCode());
+			}
+			if(yieldOrder.getYieldType() == 4){
+				yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_4.getCode());
+			}
+			if(yieldOrder.getYieldType() == 5){
+				yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_5.getCode());
+			}
+			if(yieldOrder.getYieldType() == 6){
+				yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_6.getCode());
+			}
 			yieldOrder.setYpCode(yieldJson.getString("poCode"));
 			yieldOrder.setYpArea(yieldJson.getDouble("poArea"));
 			yieldOrder.setYpQty(yieldJson.getDouble("poQty"));
@@ -582,6 +600,8 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 			yieldOrder.setStatus(YieldOrderEnum.STATUS_APS.getCode());
 			yieldOrder.setPriorityErp(yieldJson.getInteger("priority") + 14000);
 			yieldOrder.setPriorityAps(YieldOrderEnum.PRIORITY_APS_NORMAL.getCode());
+			//零件版本暂时设置为1
+			yieldOrder.setPartVersion("1");
 			// 若任务下达时间为空， 取从erp同步的时间
 			if (ObjectUtil.isEmpty(yieldOrder.getReleaseDate())) {
 				yieldOrder.setReleaseDate(yieldJson.getDate("syncTime"));

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/ProduceMonitorController.java

@@ -46,8 +46,8 @@ public class ProduceMonitorController extends BladeController {
     @GetMapping("/printWoLabel")
     @ApiOperationSupport(order = 3)
     @Operation(summary = "打印标签")
-    public Map<String, Object> printWoLabel(String woIds, Short quantity) {
-        return workOrderService.printWoLabel(Func.toLongList(woIds), quantity);
+    public Map<String, Object> printWoLabel(String woIds, String quantity) {
+        return workOrderService.printWoLabel(Func.toLongList(woIds), Short.valueOf(quantity));
     }
 
     @PostMapping("/generateWorkOrder")

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java

@@ -638,7 +638,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             // 产品应用领域
             if (yo.getPartCode() != null) {
                 Map<String, String> productInfo = this.getProductAppareaByPartCode(yo.getPartCode());
-                map.put("productApparea", StringUtils.isNotBlank(productInfo.get("productapparea")) ? productInfo.get("productapparea") : "/");
+                map.put("productApparea", productInfo != null && StringUtils.isNotBlank(productInfo.get("productapparea")) ? productInfo.get("productapparea") : "/");
             }
             // 图纸版次
             if (yo.getPartCode() != null) {

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/LiquidTankTaskServiceImpl.java

@@ -280,7 +280,8 @@ public class LiquidTankTaskServiceImpl extends BaseServiceImpl<LiquidTankTaskMap
     @Transactional
     @Override
     public R closeBat(String ids) {
-        return R.status(basicDeleteLogic(Func.toLongList(ids)));
+        basicDeleteLogic(Func.toLongList(ids));
+        return R.status(true);
     }
 
     @Transactional

blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataProduceMapper.xml

@@ -63,7 +63,7 @@
         ORDER BY a.reqdate DESC
     </select>
     <select id="getProductAppareaByPartCode" resultType="java.util.Map">
-        select b.productapparea, b.cgzmark from ( select a.* from dba_mgr.t_prtbasdef a
+        select nvl(b.productapparea,'无') as productapparea, nvl(b.cgzmark,'无') as cgzmark from ( select a.* from dba_mgr.t_prtbasdef a
         where a.prtno = #{partCode}) b where rownum = 1
     </select>
     <select id="getVersionByPartCode" resultType="java.lang.String">

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java

@@ -733,9 +733,9 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                                     //烧结订单和热表订单不同的计算逻辑
                                     if(order.getYieldType() == YieldOrderEnum.YIELD_TYPE_1.getCode()){
                                         if ("0".equals(ability.getType())) {
-                                            totalTime = totalTime + order.getYpQty() * Double.parseDouble(ability.getStandardTime()) + ability.getPrepareTime().doubleValue();
+                                            totalTime = Math.ceil(totalTime + order.getYpQty() * Double.parseDouble(ability.getStandardTime()) + ability.getPrepareTime().doubleValue());
                                         } else {
-                                            totalTime = totalTime + Double.parseDouble(ability.getStandardTime()) + ability.getPrepareTime().doubleValue();
+                                            totalTime = Math.ceil(totalTime + Double.parseDouble(ability.getStandardTime()) + ability.getPrepareTime().doubleValue());
                                         }
                                     }else{
                                         if("玻璃封接组装".equals(processMap.get(craft.getPpsId()))){//玻璃封接组装单独计算

blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java

@@ -263,7 +263,7 @@ public class StBuyOrderServiceImpl extends BaseServiceImpl<StBuyOrderMapper, StB
 
 		// 封装 ERP 提交 DTO（原逻辑完全保留）
 		List<ErpStPurOtherDTO> pdList = new ArrayList<>();
-		ErpStPurOtherDTO dto = null;
+		ErpStPurOtherDTO dto = new ErpStPurOtherDTO();
 		for (StBuyOrder bo : list) {
 			dto.setBoId(bo.getId());
 			dto.setBoCode(bo.getBoCode());