生产管理修改

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/WorkOrderRun.java

@@ -112,9 +112,9 @@ public class WorkOrderRun extends BaseEntity {
 	@Schema(description = "订单号")
 	private String woCode;
 	/**
-	 * 类型;1:转单,2:退货
+	 * 类型;1:外协,2:厂内,3:退货
 	 */
-	@Schema(description = "类型;1:转单,2:退货")
+	@Schema(description = "类型;1:外协,2:厂内,3:退货")
 	private Short runType;
 	/**
 	 * 转出班组

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

@@ -137,7 +137,7 @@ public class PlateAroundController extends BladeController {
     }
 
     @PostMapping(value = "/getByPartCode")
-    @ApiOperationSupport(order = 101)
+    @ApiOperationSupport(order = 10)
     @Operation(summary = "获取零件信息", description = "")
     public R getByPartCode(@RequestParam String partCode) {
         return R.data(plateAroundService.getByPartCode(partCode));

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

@@ -11,7 +11,6 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.desk.produce.pojo.dto.*;
-import org.springblade.desk.produce.pojo.entity.WorkOrder;
 import org.springblade.desk.produce.pojo.vo.BatchPrepareVO;
 import org.springblade.desk.produce.pojo.vo.CacheWorkOrderVO;
 import org.springblade.desk.produce.pojo.vo.WorkOrderVO;
@@ -19,7 +18,6 @@ import org.springblade.desk.produce.pojo.vo.WorkPlanRunVO;
 import org.springblade.desk.produce.service.IWorkOrderService;
 import org.springblade.desk.produce.service.impl.OrderCacheService;
 import org.springblade.desk.produce.wrapper.WorkOrderWrapper;
-import org.springblade.desk.quality.util.CodeUtil;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;

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

@@ -268,9 +268,9 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
     public boolean turnType(Long id, Integer yieldType, Long userId) {
         YieldOrder yieldOrder = yieldOrderService.getById(id);
         if (yieldOrder == null || yieldType == null) {
-            return false;
+            throw new ServiceException("未找到生产订单，参数错误！");
         }
-        yieldOrder.setYieldType(yieldType);
+        yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_2.getCode());
         return yieldOrderService.updateById(yieldOrder);
     }
 
@@ -1162,7 +1162,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
     public ProduceMonitorOrderDataVO getOrderDetail(Long woId, String partCode) {
         WorkOrder workOrder = this.getById(woId);
         DsPartEntity dsPartEntity = dsPartService.selectDsPartByPatCodeAndVersion(partCode, null);
-        if (workOrder == null || dsPartEntity == null) {
+        if (workOrder == null) {
             return null;
         }
         YieldOrder yieldOrder = yieldOrderService.getById(workOrder.getYoId());
@@ -1172,25 +1172,27 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             return null;
         }
         ProduceMonitorOrderDataVO orderDataVO = new ProduceMonitorOrderDataVO();
-        ProduceMonitorDsPartVO dsPartVO = new ProduceMonitorDsPartVO();
+        if (dsPartEntity != null) {
-        // 组装订单基础信息
+            ProduceMonitorDsPartVO dsPartVO = new ProduceMonitorDsPartVO();
-        BeanUtils.copyProperties(workOrder, orderDataVO);
+            // 组装订单基础信息
-        orderDataVO.setOrderCode(workOrderRun != null ? workOrderRun.getWoCode() : "");
+            BeanUtils.copyProperties(workOrder, orderDataVO);
-        orderDataVO.setPartCode(partCode);
+            orderDataVO.setOrderCode(workOrderRun != null ? workOrderRun.getWoCode() : "");
-        orderDataVO.setYpQty(yieldOrder.getYpQty());
+            orderDataVO.setPartCode(partCode);
-        orderDataVO.setYieldType(yieldOrder.getYieldType());
+            orderDataVO.setYpQty(yieldOrder.getYpQty());
-        orderDataVO.setCurStatus(WorkOrderEnum.getName(workOrder.getRunStatus()));
+            orderDataVO.setYieldType(yieldOrder.getYieldType());
-        orderDataVO.setPriority(WorkOrder.priorityMap.get(workOrder.getPriority()));
+            orderDataVO.setCurStatus(WorkOrderEnum.getName(workOrder.getRunStatus()));
-        User user = UserCache.getUser(workOrder.getDispatcher());
+            orderDataVO.setPriority(WorkOrder.priorityMap.get(workOrder.getPriority()));
-        orderDataVO.setDispatcher(user != null ? user.getRealName() : "");
+            User user = UserCache.getUser(workOrder.getDispatcher());
-        orderDataVO.setProdIdent(yieldOrder.getProductIdent());
+            orderDataVO.setDispatcher(user != null ? user.getRealName() : "");
-        orderDataVO.setYpMemo(yieldOrder.getYpMemo());
+            orderDataVO.setProdIdent(yieldOrder.getProductIdent());
-        orderDataVO.setMainProcessingUnit(workOrder.getTsId() != null ? teamSetService.getById(workOrder.getTsId()).getTsName() : workOrder.getOcId() != null ? oemService.getById(workOrder.getOcId()).getOcName() : "");
+            orderDataVO.setYpMemo(yieldOrder.getYpMemo());
-        // 组装零件信息
+            orderDataVO.setMainProcessingUnit(workOrder.getTsId() != null ? teamSetService.getById(workOrder.getTsId()).getTsName() : workOrder.getOcId() != null ? oemService.getById(workOrder.getOcId()).getOcName() : "");
-        BeanUtils.copyProperties(dsPartEntity, dsPartVO);
+            // 组装零件信息
-        // todo erp查询pdm零件图纸地址
+            BeanUtils.copyProperties(dsPartEntity, dsPartVO);
-        dsPartVO.setUrl("http://MESLoginUser:MESloginUseradmin@pdm.caoe.com/Windchill/netmarkets/jsp/ext/caoe/mes/export.jsp?oid=");
+            // todo erp查询pdm零件图纸地址
-        orderDataVO.setDsPart(dsPartVO);
+            dsPartVO.setUrl("http://MESLoginUser:MESloginUseradmin@pdm.caoe.com/Windchill/netmarkets/jsp/ext/caoe/mes/export.jsp?oid=");
+            orderDataVO.setDsPart(dsPartVO);
+        }
 
         // 组装工序信息
         for (ProduceMonitorWorkPlanVO workPlan : workPlans) {

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

@@ -46,8 +46,8 @@
             b.prtlotno,
             b.deptcode
         FROM
-            dba_mgr.v_mes_rb_redorout @erp_mes_link a,
+            dba_mgr.v_mes_rb_redorout a,
-            dba_mgr.v_mes_rb_redo @erp_mes_link b
+            dba_mgr.v_mes_rb_redo b
         <where>
             a.redono = b.redono AND a.splcode = b.splcode AND a.prtno = b.prtno AND a.amount = b.amount
             <if test="query.reworkCode != null and query.reworkCode != ''">
@@ -63,17 +63,17 @@
         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@erp_mes_link a
+        select b.productapparea, b.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">
-        select b.version from (select version from dba_mgr.drwversion@erp_mes_link a where a.drwpartno in (
+        select b.version from (select version from dba_mgr.drwversion a where a.drwpartno in (
-            select drwpartno from dba_mgr.t_prtbasdef@erp_mes_link where prtno = #{partCode})) b where rownum=1
+            select drwpartno from dba_mgr.t_prtbasdef where prtno = #{partCode})) b where rownum=1
     </select>
     <select id="getCustodianByRecDept" resultType="java.lang.String">
         SELECT max(a.userdesc)
-        FROM aepcs_system.t_sysuser@erp_mes_link a,
+        FROM aepcs_system.t_sysuser a,
-             dba_mgr.t_prtplndef@erp_mes_link b
+             dba_mgr.t_prtplndef b
         where a.username = b.warctlr
           and b.prtno = #{partCode}
           and b.plndept = #{recDept}