生产管理修改

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

@@ -1,5 +1,6 @@
 package org.springblade.desk.produce.pojo.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -28,6 +29,10 @@ public class MakeRec extends BaseEntity {
 	@Schema(description = "操作工")
 	private Long worker;
 
+	@Schema(description = "操作工")
+	@TableField(exist = false)
+	private String workerName;
+
 	@Schema(description = "报工日期")
 	private Date makeTime;
 

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/DisTaskingMapper.xml

@@ -64,6 +64,7 @@
                 LEFT JOIN BS_PROCESS_SET d ON a.PPS_ID = d.ID
                 LEFT JOIN BS_TEAM_SET e ON a.MAKE_TEAM = e.ID
         WHERE a.WO_ID = #{id}
+        ORDER BY a.ORDERS
     </select>
     <select id="queryByWpIdlLst" resultType="org.springblade.desk.produce.pojo.entity.MakeRec">
         select a.* from mes_make_rec a

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

@@ -94,7 +94,14 @@ public class DisTaskingServiceImpl extends BaseServiceImpl<DisTaskingMapper, Dis
 
     @Override
     public List<MakeRec> queryByWpIdlLst(Long wpId) {
-        return baseMapper.queryByWpIdlLst(wpId);
+        List<MakeRec> makeRecs = baseMapper.queryByWpIdlLst(wpId);
+        makeRecs.forEach(makeRec -> {
+            User user = UserCache.getUser(makeRec.getWorker());
+            if (user != null) {
+                makeRec.setWorkerName(user.getName());
+            }
+        });
+        return makeRecs;
     }
 
     @Override

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

@@ -114,6 +114,7 @@ public class OrderDeclareServiceImpl extends BaseServiceImpl<OrderDeclareMapper,
 //                    orderDeclare.getQuaLevel(), orderDeclare.getDeptNo(), orderDeclare.getWarnNo(), orderDeclare.getLocationNo(),
 //                    orderDeclare.getWoCode(), AuthUtil.getUserName()).getData();
             orderDeclare.setUseCode("code");
+            orderDeclare.setPodStatus(OrderDeclare.NEW_DATA);
         }
         return this.saveBatch(orderDeclares);
     }