功能修改-sjx

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldPlan.java

@@ -67,7 +67,7 @@ public class YieldPlan extends BaseEntity {
 	 * 使用部门
 	 */
 	@TableField(value = "USE_DEPT")
-	private Long useDept;
+	private String useDept;
 
 	/**
 	 * 数量
@@ -91,7 +91,7 @@ public class YieldPlan extends BaseEntity {
 	 * 计划员
 	 */
 	@TableField(value = "PLAN_USER")
-	private Long planUser;
+	private String planUser;
 
 	/**
 	 * 计划下达时间

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/YieldPlanVo.java

@@ -32,4 +32,6 @@ public class YieldPlanVo extends YieldPlan {
 	 * 计划员名称
 	 */
 	String planUserName;
+
+	String useDeptName;
 }

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbWo.java

@@ -36,4 +36,5 @@ public class MesRbWo {
     private String processlinedesc;    //工艺路线详情
     private String prodline;    //产品系列
     private Double prtarea; //单件面积平方毫米
+    private String plannerdesc;//计划员
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldOrderController.java

@@ -28,7 +28,9 @@ import org.springblade.scheduling.feign.IWorkOrderClient;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 应用管理控制器 - 生产订单
@@ -291,10 +293,23 @@ public class YieldOrderController extends BladeController {
 
 	@PostMapping("/calculateCoatingMaterial")
 	@Operation(summary = "镀层物料需求", description = "")
-	public R calculateCoatingMaterial(@Parameter(description = "主键", required = true) @RequestParam Long id) {
+	public R calculateCoatingMaterial(@Parameter(description = "主键", required = true) @RequestParam String ids) {
-		YieldOrder yieldOrder = yieldOrderService.getById(id);
+		Map<String,Integer> map = new HashMap<>();
-		Boolean result = goodsRecordService.calculateCoatingMaterial(yieldOrder);
+		int success = 0;
-		return R.status(result);
+		int fail = 0;
+		List<Long> idList= Func.toLongList(ids);
+		for(Long id : idList){
+			YieldOrder yieldOrder = yieldOrderService.getById(id);
+			Boolean result = goodsRecordService.calculateCoatingMaterial(yieldOrder);
+			if(result){
+				success++;
+			}else{
+				fail++;
+			}
+		}
+		map.put("success",success);
+		map.put("fail",fail);
+		return R.data(map);
 	}
 
 	/**

blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml

@@ -56,6 +56,7 @@
         <if test = "entity.status != null and entity.status != ''">
             AND status = #{entity.status}
         </if>
+		order by release_date desc
     </select>
 
     <select id = "pageMaterialApply" resultType = "org.springblade.desk.order.pojo.entity.YieldOrder">

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

@@ -24,8 +24,6 @@ import org.springblade.desk.order.service.IYieldOrderService;
 import org.springblade.desk.order.service.IYieldPlanService;
 import org.springblade.erpdata.feign.IErpPartoplinkFirseqClient;
 import org.springblade.erpdata.pojo.dto.PartoplinkFirseqDTO;
-import org.springblade.system.cache.UserCache;
-import org.springblade.system.pojo.vo.RegionVO;
 import org.springblade.wms.feign.StRealtimeStockClient;
 import org.springblade.wms.pojo.entity.StRealtimeStock;
 import org.springblade.wms.pojo.vo.StGoodStatisVO;
@@ -223,9 +221,7 @@ public class YieldPlanServiceImpl extends BaseServiceImpl<YieldPlanMapper, Yield
 				yieldOrder.setProductIdent(yieldPlan.getProductIdent());
 				yieldOrder.setUseDept("热表分厂");
 				yieldOrder.setDemandDate(yieldPlan.getDemandDate());
-				if (null != UserCache.getUser(yieldPlan.getPlanUser())) {
+				yieldOrder.setPlanUser(yieldPlan.getPlanUser());
-					yieldOrder.setPlanUser(UserCache.getUser(yieldPlan.getPlanUser()).getRealName());
-				}
 				yieldOrder.setReleaseDate(new Date());
 				yieldOrder.setMemo(yieldPlan.getMemo());
 				yieldOrder.setCardNo(cardNo);

blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/YieldPlanWrapper.java

@@ -2,12 +2,9 @@ package org.springblade.desk.order.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.core.tool.utils.Func;
 import org.springblade.desk.order.pojo.entity.YieldPlan;
 import org.springblade.desk.order.pojo.enums.YieldPlanEnum;
 import org.springblade.desk.order.pojo.vo.YieldPlanVo;
-import org.springblade.system.cache.UserCache;
-import org.springblade.system.pojo.entity.User;
 
 import java.util.Objects;
 
@@ -26,11 +23,14 @@ public class YieldPlanWrapper extends BaseEntityWrapper<YieldPlan, YieldPlanVo>
 	public YieldPlanVo entityVO(YieldPlan entity) {
 		YieldPlanVo vo = Objects.requireNonNull(BeanUtil.copyProperties(entity, YieldPlanVo.class));
 		vo.setStatusName(YieldPlanEnum.getName(entity.getStatus()));
-
+		/*Dept dept = SysCache.getDept(entity.getUseDept());
+		if(Func.isNotEmpty(dept)){
+			vo.setUseDeptName(dept.getDeptName());
+		}
 		User user = UserCache.getUser(entity.getPlanUser());
 		if (Func.isNotEmpty(user)) {
 			vo.setPlanUserName(user.getAccount());
-		}
+		}*/
 		return vo;
 	}
 }

blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java

@@ -170,7 +170,8 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
 				yieldPlan.setPartName(part.getPartName());
 				yieldPlan.setPrimaryCraft(part.getCraftWay());
 			}
-			yieldPlan.setUseDept(Long.valueOf(mesRbWo.getPlndept()));
+			yieldPlan.setUseDept(mesRbWo.getPlndept());
+			yieldPlan.setPlanUser(mesRbWo.getPlannerdesc());
 			yieldPlan.setPlate(mesRbWo.getKdofplat());
 			yieldPlan.setMemo(mesRbWo.getRemark());
 			yieldPlan.setDominantDept(mesRbWo.getPrtmdept());
@@ -354,6 +355,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
 			yieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_RB);
 			yieldOrder.setYpMemo("临时工艺转工");
 			yieldOrder.setManualIncrease(false);
+			yieldOrder.setYpCode(mesRbPacturnrecord.getWono());
 			yieldOrder.setYoCode(mesRbPacturnrecord.getSono());//生产单号
 			yieldOrder.setBatchNo(mesRbPacturnrecord.getSplcode());//批次号
 			yieldOrder.setPartCode(mesRbPacturnrecord.getPrtno());//零件号
@@ -418,6 +420,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
 			yieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_SJ);
 			yieldOrder.setManualIncrease(false);
 			yieldOrder.setYoCode(mesRbtoso.getSono());//生产单号
+			yieldOrder.setYpCode(mesRbtoso.getWono());
 			yieldOrder.setBatchNo(mesRbtoso.getSplcode());//批次号
 			yieldOrder.setPartCode(mesRbtoso.getPrtno());//零件号
 			yieldOrder.setProductIdent(mesRbtoso.getPrtlotno());
@@ -476,6 +479,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
 			yieldOrder.setYpMemo("推进计划");
 			yieldOrder.setManualIncrease(false);
 			yieldOrder.setYoCode(mesRbWxpromotion.getSono());//生产单号
+			yieldOrder.setYpCode(mesRbWxpromotion.getWono());
 			yieldOrder.setBatchNo(mesRbWxpromotion.getSplcode());//批次号
 			yieldOrder.setPartCode(mesRbWxpromotion.getPrtno());//零件号
 			yieldOrder.setProductIdent(mesRbWxpromotion.getPrtlotno());
@@ -542,6 +546,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
 			yieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_RB);
 			yieldOrder.setManualIncrease(false);
 			yieldOrder.setYoCode(mesRbSodelrecwx.getSono());//生产单号
+			yieldOrder.setYpCode(mesRbSodelrecwx.getWono());
 			yieldOrder.setBatchNo(mesRbSodelrecwx.getSplcode());//批次号
 			yieldOrder.setPartCode(mesRbSodelrecwx.getPrtno());//零件号
 			yieldOrder.setProductIdent(mesRbSodelrecwx.getPrtlotno());
@@ -611,6 +616,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
 			yieldOrder.setYpMemo("正式工艺转工");
 			yieldOrder.setManualIncrease(false);
 			yieldOrder.setYoCode(mesRbSodelreczg.getSono());//生产单号
+			yieldOrder.setYpCode(mesRbSodelreczg.getWono());
 			yieldOrder.setBatchNo(mesRbSodelreczg.getSplcode());//批次号
 			yieldOrder.setPartCode(mesRbSodelreczg.getPrtno());//零件号
 			yieldOrder.setProductIdent(mesRbSodelreczg.getPrtlotno());
@@ -683,6 +689,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
 			yieldOrder.setSiteWork(true);
 			yieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_RB);
 			yieldOrder.setYoCode(mesRbPk.getWono());//生产单号
+			yieldOrder.setYpCode(mesRbPk.getWono());
 			yieldOrder.setBatchNo(mesRbPk.getSplcode());//批次号
 			yieldOrder.setPartCode(mesRbPk.getPrtno());//零件号
 			yieldOrder.setProductIdent(mesRbPk.getPrtlotno());