生产工序业务修改

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TSampleList.java

@@ -104,4 +104,10 @@ public class TSampleList implements Serializable {
      */
     @TableField("RecordCode")
     private byte[] RecordCode;
+
+    /**
+     * 化验室是否已接收，0未接收，1已接收
+     */
+    @TableField("Flag")
+    private byte[] Flag;
 }

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TMineWorkemployeesServiceImpl.java

@@ -123,9 +123,16 @@ public class TMineWorkemployeesServiceImpl extends ServiceImpl<TMineWorkemployee
         //参数校验
         Rcode.NOT_PARAM.assertNotNull(query);
         Rcode.NOT_PARAM.assertNotNull(query.getUid());
+        //判断日期是否存在
         if (query.getGzsj() != null) {
             R r1 = getByQuery(query);
-            if (r1.getData() != null) return R.failed("员工上班统计中->上班日期已存在，不能修改");
+            //如果日期存在，需要排除是否是当前数据
+            if (r1.getData() != null) {
+                TMineWorkemployees tMineWorkemployees = (TMineWorkemployees) r1.getData();
+                if (!query.getUid().equals(tMineWorkemployees.getUid())){
+                    return R.failed("员工上班统计中->上班日期已存在，不能修改");
+                }
+            }
         }
         //tag不能添加
         if (StringUtils.isNotBlank(query.getTag())) {

acquisition-business/target/classes/cn/wise/sc/acquisition/business/mapper/DataStatisticsMapper.xml

@@ -35,7 +35,7 @@
 
 
     <select id="countByTable" resultType="cn.wise.sc.acquisition.business.model.vo.DataStatisticsTableVo">
-        SELECT  tw.Uid,Convert(varchar(19),tw.Rq,120)as Rq,tw.TruckID,'发货单位' as clientName,tpt.WorkType,tw.Mz,tw.Pz,tw.Jz
+        SELECT  tw.ID as Uid,Convert(varchar(19),tw.Rq,120)as Rq,tw.TruckID,'发货单位' as clientName,tpt.WorkType,tw.Mz,tw.Pz,tw.Jz
         FROM T_Weight tw
         left join T_Processes_Truck tpt on tpt.TruckID = tw.TruckID
         where 1=1