Merge branch 'master' of http://42.192.7.176:3000/suojin/jonhon-mes-svr

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

@@ -5,6 +5,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.desk.device.pojo.entity.EquipmentEntity;
 import org.springblade.desk.device.pojo.entity.FeiBaSetEntity;
@@ -37,7 +38,7 @@ public class PdaLoadController {
     @ApiOperationSupport(order = 1)
     @Operation(summary = "根据流程卡号数据", description  = "传入cardNo")
     public R<BindModelVO> loadBindData(@PathVariable String cardNo) {
-        return R.data(pdaLoadService.loadBindData(1297L, cardNo));
+        return R.data(pdaLoadService.loadBindData(AuthUtil.getUserId(), cardNo));
     }
 
     @GetMapping(value = "/getBsRackSetByCode/{rsCode}")

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

@@ -49,7 +49,7 @@
         INNER JOIN MES_work_plan b ON a.WP_ID = b.ID
         INNER JOIN MES_WORK_ORDER c ON b.WO_ID = c.ID
         INNER JOIN MES_YIELD_ORDER d ON c.YO_ID = d.ID
-        INNER JOIN DS_PART_BASICS f ON d.part_code = f.part_code
+        INNER JOIN DS_PART f ON d.part_code = f.part_code
         WHERE
         a.MTN_CODE IN ( SELECT a.MTN_CODE FROM MES_MAC_TOOL_USE a LEFT JOIN MES_EQUIPMENT b ON a.EQUIPMENT_CARD =
         b.ID WHERE a.WP_ID = #{id}

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

@@ -81,7 +81,7 @@
                   inner join MES_WORK_PLAN b on a.WP_ID = b.ID
                   inner join MES_WORK_ORDER c on b.WO_ID = c.ID
                   inner join MES_YIELD_ORDER d on c.YO_ID = d.ID
-                  inner join DS_PART_BASICS f on d.PART_CODE = f.PART_CODE
+                  inner join DS_PART f on d.PART_CODE = f.PART_CODE
                   where a.MTN_CODE in (
                       select a.MTN_CODE from MES_MAC_TOOL_USE a
                       left join MES_EQUIPMENT_CARD b on a.EQUIPMENT_CARD = b.ID
@@ -106,7 +106,7 @@
                     inner join MES_WORK_PLAN b on a.WP_ID = b.ID
                     inner join MES_WORK_ORDER c on b.WO_ID = c.ID
                     inner join MES_YIELD_ORDER d on c.YO_ID = d.ID
-                    inner join DS_PART_BASICS f on d.PART_CODE = f.PART_CODE
+                    inner join DS_PART f on d.PART_CODE = f.PART_CODE
                     where a.MTN_CODE in (
                     select a.MTN_CODE from MES_MAC_TOOL_USE a
                     left join MES_EQUIPMENT_CARD b on a.EQUIPMENT_CARD = b.ID
@@ -207,7 +207,7 @@
                          inner join MES_WORK_PLAN b on a.WP_ID = b.ID
                          inner join MES_WORK_ORDER c on b.WO_ID = c.ID
                          inner join MES_YIELD_ORDER d on c.YO_ID = d.ID
-                         inner join DS_PART_BASICS f on d.part_code = f.part_code
+                         inner join DS_PART f on d.part_code = f.part_code
                         where a.MTN_CODE in(
                             select a.MTN_CODE from MES_MAC_TOOL_USE a
                             left join MES_EQUIPMENT_CARD b on a.EQUIPMENT_CARD = b.ID

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

@@ -305,7 +305,7 @@ public class PlateAroundServiceImpl extends BaseServiceImpl<PlateAroundMapper, P
                 newPa.setMakeTime(date);
                 newPa.setMakeMan(user.getUserId());
             }
-            newPa.setWpId(wp.getNextWpId());
+            newPa.setWpId(wp.getId());
             newPa.setTsId(wp.getMakeTeam());
             this.updatePrPlateAround(newPa);
             this.save(newPa);

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

@@ -39,12 +39,14 @@
         </where>
     </select>
     <select id = "getNewlevdateMax" resultType = "java.lang.String">
-        SELECT nvl(max(a.newlevdate), selectTime)
-        as newlevdateMax
+        SELECT
+        COALESCE(
+        TO_CHAR(MAX(a.newlevdate), 'YYYY-MM-DD HH24:MI:SS'),
+        #{selectTime}
+        ) as newlevdateMax
         FROM dba_mgr.v_mes_rb_pacturnrecord a
         <where>
-            a.newlevdate <![CDATA[ >= ]]> to_date(#{selectTime},'YYYY-MM-DD HH24:MI:SS')
+            a.newlevdate >= TO_DATE(#{selectTime}, 'YYYY-MM-DD HH24:MI:SS')
         </where>
-        ORDER BY a.newlevdate DESC;
     </select>
 </mapper>

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

@@ -7,14 +7,15 @@
     </select>
 
     <select id = "getNewlevdateMax" resultType = "java.lang.String">
-        SELECT nvl(max(a.newlevdate), selectTime)
-        as newlevdateMax
+        SELECT
+        COALESCE(
+        TO_CHAR(MAX(a.newlevdate), 'YYYY-MM-DD HH24:MI:SS'),
+        #{selectTime}
+        ) as newlevdateMax
         FROM dba_mgr.v_mes_rb_pk a
         <where>
-           1=1
-            AND a.newlevdate <![CDATA[ >= ]]> to_date(#{selectTime},'YYYY-MM-DD HH24:MI:SS')
+            a.newlevdate >= TO_DATE(#{selectTime}, 'YYYY-MM-DD HH24:MI:SS')
         </where>
-        ORDER BY a.newlevdate DESC;
     </select>
     <select id = "getMesRbPkList" resultType = "org.springblade.erpdata.pojo.dto.view.MesRbPk">
         SELECT

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

@@ -7,14 +7,15 @@
     </select>
 
     <select id = "getNewlevdateMax" resultType = "java.lang.String">
-        SELECT nvl(max(a.newlevdate), selectTime)
-                   as newlevdateMax
+        SELECT
+        COALESCE(
+        TO_CHAR(MAX(a.newlevdate), 'YYYY-MM-DD HH24:MI:SS'),
+        #{selectTime}
+        ) as newlevdateMax
         FROM dba_mgr.V_MES_RB_PURTOSO a
         <where>
-            a.is_deleted = 0
-            AND a.newlevdate <![CDATA[ >= ]]> to_date(#{selectTime},'YYYY-MM-DD HH24:MI:SS')
+            a.newlevdate >= TO_DATE(#{selectTime}, 'YYYY-MM-DD HH24:MI:SS')
         </where>
-        ORDER BY a.newlevdate DESC;
     </select>
 
     <select id = "getMesRbPurtosoList" resultType = "org.springblade.erpdata.pojo.dto.view.MesRbPurtoso">

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

@@ -38,13 +38,15 @@
             a.newlevdate > v_select_time*/
     </select>
     <select id = "getNewlevdateMax" resultType = "java.lang.String">
-        SELECT nvl(max(a.newlevdate), selectTime)
-        as newlevdateMax
+        SELECT
+        COALESCE(
+        TO_CHAR(MAX(a.newlevdate), 'YYYY-MM-DD HH24:MI:SS'),
+        #{selectTime}
+        ) as newlevdateMax
         FROM dba_mgr.v_mes_rb_sjso a
         <where>
-            a.newlevdate <![CDATA[ >= ]]> to_date(#{selectTime},'YYYY-MM-DD HH24:MI:SS')
+            a.newlevdate >= TO_DATE(#{selectTime}, 'YYYY-MM-DD HH24:MI:SS')
         </where>
-        ORDER BY a.newlevdate DESC;
     </select>
 
 </mapper>

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

@@ -6,14 +6,15 @@
         SELECT * FROM dba_mgr.v_mes_rb_sodelrecwx WHERE is_deleted = 0
     </select>
     <select id = "getNewlevdateMax" resultType = "java.lang.String">
-        SELECT nvl(max(a.newlevdate), selectTime)
-        as newlevdateMax
+        SELECT
+        COALESCE(
+        TO_CHAR(MAX(a.newlevdate), 'YYYY-MM-DD HH24:MI:SS'),
+        #{selectTime}
+        ) as newlevdateMax
         FROM dba_mgr.v_mes_rb_sodelrecwx a
         <where>
-            a.is_deleted = 0
-            AND a.newlevdate <![CDATA[ >= ]]> to_date(#{selectTime},'YYYY-MM-DD HH24:MI:SS')
+            a.newlevdate >= TO_DATE(#{selectTime}, 'YYYY-MM-DD HH24:MI:SS')
         </where>
-        ORDER BY a.newlevdate DESC;
     </select>
     <select id = "getMesRbSodelrecwxList" resultType = "org.springblade.erpdata.pojo.dto.view.MesRbSodelrecwx">
         SELECT

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

@@ -5,14 +5,16 @@
     <select id = "getMesRbSodelreczgErpList" resultType = "org.springblade.erpdata.pojo.dto.view.MesRbSodelreczg">
         SELECT * FROM v_mes_rb_sodelreczg WHERE is_deleted = 0
     </select>
-    <select id = "getNewlevdateMax" resultType = "java.lang.String">
-        SELECT nvl(max(a.newlevdate), selectTime)
-        as newlevdateMax
+    <select id="getNewlevdateMax" resultType="java.lang.String">
+        SELECT
+        COALESCE(
+        TO_CHAR(MAX(a.newlevdate), 'YYYY-MM-DD HH24:MI:SS'),
+        #{selectTime}
+        ) as newlevdateMax
         FROM dba_mgr.v_mes_rb_sodelreczg a
         <where>
-            a.newlevdate <![CDATA[ >= ]]> to_date(#{selectTime},'YYYY-MM-DD HH24:MI:SS')
+            a.newlevdate >= TO_DATE(#{selectTime}, 'YYYY-MM-DD HH24:MI:SS')
         </where>
-        ORDER BY a.newlevdate DESC;
     </select>
     <select id = "getMesRbSodelreczgList" resultType = "org.springblade.erpdata.pojo.dto.view.MesRbSodelreczg">
         SELECT

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

@@ -29,13 +29,14 @@
     </select>
 
     <select id="getNewlevdateMax" resultType="java.lang.String">
-        SELECT nvl(max(a.wopordat), selectTime)
-        as newlevdateMax
+        SELECT
+        COALESCE(
+        TO_CHAR(MAX(a.wopordat), 'YYYY-MM-DD HH24:MI:SS'),
+        #{selectTime}
+        ) as newlevdateMax
         FROM dba_mgr.v_mes_rb_wo a
         <where>
-            a.is_deleted = 0
-            AND a.wopordat <![CDATA[ >= ]]> to_date(#{selectTime},'YYYY-MM-DD HH24:MI:SS')
+            a.wopordat >= TO_DATE(#{selectTime}, 'YYYY-MM-DD HH24:MI:SS')
         </where>
-        ORDER BY a.wopordat DESC;
     </select>
 </mapper>

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

@@ -37,13 +37,15 @@
             a.newlevdate > v_select_time-1 / 24 / 6*/
     </select>
     <select id = "getNewlevdateMax" resultType = "java.lang.String">
-        SELECT nvl(max(a.newlevdate), selectTime)
-        as newlevdateMax
+        SELECT
+        COALESCE(
+        TO_CHAR(MAX(a.newlevdate), 'YYYY-MM-DD HH24:MI:SS'),
+        #{selectTime}
+        ) as newlevdateMax
         FROM dba_mgr.v_mes_rb_wxpromotion a
         <where>
-            a.newlevdate <![CDATA[ >= ]]> to_date(#{selectTime},'YYYY-MM-DD HH24:MI:SS')
+            a.newlevdate >= TO_DATE(#{selectTime}, 'YYYY-MM-DD HH24:MI:SS')
         </where>
-        ORDER BY a.newlevdate DESC;
     </select>
 
 </mapper>

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

@@ -172,7 +172,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
 			yieldPlan.setDominantDept(mesRbWo.getPrtmdept());
 			yieldPlan.setPrimaryCraft(mesRbWo.getProcessline());
 			yieldPlan.setProductLine(mesRbWo.getProdline());
-			yieldPlan.setPlanType(12001L);//赋值默认值12001
+			yieldPlan.setPlanType(Long.valueOf(YieldPlanEnum.PLAN_TYPE_1.getCode()));//赋值默认值12001
 			if(mesRbWo.getProcesslinedesc().contains("封接")
 					||"LX08-05-028,LX08-05-030,LX08-05-031".contains(mesRbWo.getProcessline())){
 				yieldPlan.setPlanType(12002L);
@@ -341,7 +341,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService {
 			yieldOrder.setPkUsername(mesRbPacturnrecord.getRecname());
 			yieldOrder.setPkDate(mesRbPacturnrecord.getWoreqdat());
 //			List<DsPartEntity> dsPartList=apsOrderClient.getDsCraftListByCode(mesRbPacturnrecord.getPrtno());
-//			yieldOrder.setYieldType(12001);
+			yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_1.getCode());
 //			if(dsPartList!=null&&dsPartList.get(0).getCraftWay().contains("封接")){
 //				yieldOrder.setYieldType(12002);
 //			}