报工异常 返回附件信息

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/ChanjetController.java

@@ -9,6 +9,7 @@ import com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.vo.BomMaterialVO
 import com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.vo.QueryCurrentStockResVO;
 import com.chanko.yunxi.mes.module.biz.controller.admin.procedure.vo.ProcedureSaveReqVO;
 import com.chanko.yunxi.mes.module.biz.manager.ChanjetManager;
+import com.chanko.yunxi.mes.module.biz.manager.ChanjetSchedule;
 import com.chanko.yunxi.mes.module.system.controller.admin.user.vo.user.UserSaveReqVO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -44,6 +45,9 @@ public class ChanjetController {
     private ChanjetSpi chanjetSpi;
     @Resource
     private ChanjetManager chanjetManager;
+
+    @Resource
+    private ChanjetSchedule chanjetSchedule;
     @Resource
     private ChanjetTokenHolder chanjetTokenHolder;
 
@@ -214,13 +218,34 @@ public class ChanjetController {
 
     public void synchronizeData() throws ChanjetApiException{
 
-        chanjetManager.queryDept();
+        //查询部门
-        chanjetManager.queryWorkshop();
+        chanjetSchedule.queryDept();
-        chanjetManager.queryCustomer();
+        //查询车间
-        chanjetManager.querySupplier();
+        chanjetSchedule.queryWorkshop();
-        chanjetManager.queryMaterial();
+        //查询客户
-        chanjetManager.queryProjectOrder();
+        chanjetSchedule.queryCustomer();
-
+        //查询供应商
-        chanjetManager.queryWarehouse();
+        chanjetSchedule.querySupplier();
+        //查询销售订单列表
+        chanjetSchedule.queryProjectOrder();
+
+        //查询bom表
+        chanjetSchedule.queryProcessBom(null,null);
+        //查询存货
+        chanjetSchedule.queryMaterial();
+        //查询库存-现存量
+        chanjetSchedule.queryStock(null,null);
+        //查询仓库
+        chanjetSchedule.queryWarehouse();
+
+        //创建入库
+        chanjetSchedule.createStorageInOrder(new Long(0));
+        //创建出库
+        chanjetSchedule.createStockOutOrder(new Long(0));
+
+        //创建工序
+        chanjetSchedule.createProcedure(null);
+        //创建员工
+        chanjetSchedule.createUser(null);
     }
 }

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/ChanjetInterfaceEnum.java

@@ -20,7 +20,7 @@ public enum ChanjetInterfaceEnum {
     CREATE_PROCEDURE("/tplus/api/v2/process/Create", "创建工序", CreateProcedureReqVO.class, Long.class),
     CREATE_EMPLOYEE("/tplus/api/v2/person/Create", "创建员工", CreateOrUpdateEmployeeReqVO.class, Long.class),
     UPDATE_EMPLOYEE("/tplus/api/v2/person/Update", "更新员工", CreateOrUpdateEmployeeReqVO.class, Boolean.class),
-    QUERY_INVENTORY("/tplus/api/v2/inventory/Query", "查询物料", QueryMaterialReqVO.class, QueryMaterialResVO.class),
+    QUERY_INVENTORY("/tplus/api/v2/inventory/Query", "查询物料(存货)", QueryMaterialReqVO.class, QueryMaterialResVO.class),
     QUERY_SALE_ORDER_LIST("/tplus/api/v2/SaleOrderOpenApi/FindVoucherList", "查询销售订单列表", QuerySaleOrderListReqVO.class, ListResultResVO.class),
     QUERY_SALE_ORDER("/tplus/api/v2/SaleOrderOpenApi/GetVoucherDTO", "查询销售订单", QuerySaleOrderReqVO.class, ResultResVO.class),
     CREATE_REPORT("/tplus/api/v2/ManufactureReportOpenApi/Create", "创建报工记录", CreateReportReqVO.class, ResultResVO.class),
@@ -30,8 +30,8 @@ public enum ChanjetInterfaceEnum {
     CREATE_PRODUCTION_ORDER("/tplus/api/v2/ManufactureOrderOpenApi/Create", "创建生产加工单", CreateProductionOrderReqVO.class, ResultResVO.class),
     AUDIT_PRODUCTION_ORDER("/tplus/api/v2/ManufactureOrderOpenApi/Audit", "审核生产加工单", AuditProductionOrderReqVO.class, ResultResVO.class),
     QUERY_PRODUCTION_ORDER_LIST("/tplus/api/v2/ManufactureOrderOpenApi/FindVoucherList", "查询生产加工单", ListProductionOrderReqVO.class, ListResultResVO.class),
-    QUERY_BOM("/tplus/api/v2/bom/Query", "查询物料清单列表", QueryBomReqVO.class, QueryBomResVO.class),
+    QUERY_BOM("/tplus/api/v2/bom/Query", "查询bom列表", QueryBomReqVO.class, QueryBomResVO.class),
-    QUERY_CURRENT_STOCK("/tplus/api/v2/currentStock/Query", "查询存货", QueryCurrentStockReqVO.class, QueryCurrentStockResVO.class),
+    QUERY_CURRENT_STOCK("/tplus/api/v2/currentStock/Query", "查询库存", QueryCurrentStockReqVO.class, QueryCurrentStockResVO.class),
     QUERY_WAREHOUSE("/tplus/api/v2/warehouse/Query", "查询仓库", QueryWarehouseReqVO.class, QueryWarehouseResVO.class),
     ;
 

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/unqualifiednotification/UnqualifiedNotificationDO.java

@@ -145,6 +145,9 @@ public class UnqualifiedNotificationDO extends BaseDO {
     @TableField(exist = false)
     private String workshopName;
 
+    @TableField(exist = false)
+    private  String fileUrl;
+
     public boolean canSave(){
         return UnqualifiedNotificationStatusEnum.SAVE.getCode() == this.notificationStatus.intValue();
     }

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/unqualifiednotification/UnqualifiedNotificationMapper.java

@@ -12,6 +12,7 @@ import com.chanko.yunxi.mes.module.biz.dal.dataobject.projectorder.ProjectOrderD
 import com.chanko.yunxi.mes.module.biz.dal.dataobject.projectorder.ProjectOrderSubDO;
 import com.chanko.yunxi.mes.module.biz.dal.dataobject.unqualifiednotification.UnqualifiedNotificationDO;
 import com.chanko.yunxi.mes.module.biz.dal.dataobject.workshop.WorkshopDO;
+import com.chanko.yunxi.mes.module.infra.dal.dataobject.file.FileDO;
 import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import org.apache.ibatis.annotations.Mapper;
@@ -34,6 +35,7 @@ public interface UnqualifiedNotificationMapper extends BaseMapperX<UnqualifiedNo
                 .select("u1.nickname as ownerName", "u2.nickname as creatorName", "u3.nickname as auditorName")
                 .select("h.name as procedureName")
                 .select("i.name as workshopName")
+                .select("(select GROUP_CONCAT(url) from infra_file where business_type='errorOrderPhoto' and business_id=t.id) as fileUrl")
                 .leftJoin(PlanSubDO.class, "b", PlanSubDO::getProjectSubId, UnqualifiedNotificationDO::getProjectSubId)
                 .leftJoin(ProjectOrderSubDO.class, "c", ProjectOrderSubDO::getId, UnqualifiedNotificationDO::getProjectSubId)
                 .leftJoin(ProjectOrderDO.class, "d", ProjectOrderDO::getId, UnqualifiedNotificationDO::getProjectId)