杰生重构

hx-service/storage-restructure/src/main/java/com/fjhx/mapper/supplier/SupplierMapper.xml

@@ -4,14 +4,15 @@
 
     <select id="getPage" resultType="java.util.LinkedHashMap">
         select distinct
-            s.id,
-            s.code supplierCoded,
-            s.name supplierName,
-            mc.name malssifyName,
-            s.account_date accountDate,
-            s.account_date_remark accountDateRemark,
-            sc.link_men linkMen,
-            sc.telephone
+        s.id,
+        s.code supplierCoded,
+        s.name supplierName,
+        mc.name malssifyName,
+        s.account_date accountDate,
+        s.account_date_remark accountDateRemark,
+        sc.link_men linkMen,
+        sc.telephone,
+        m.price
         from supplier s
         left join supplier_price sp on s.id = sp.supplier_id
         left join material m on m.id = sp.material_id
@@ -85,6 +86,9 @@
         <if test="condition.purpose neq null and condition.purpose neq ''">
             and m.purpose = #{condition.purpose}
         </if>
+        <if test="condition.materialId neq null and condition.materialId neq ''">
+            and m.id = #{condition.materialId}
+        </if>
         <choose>
             <when test="condition.safetyWarnDay eq 1">
                 AND m.safety_warn_day &lt; 5

hx-service/storage-restructure/src/main/java/com/fjhx/service/contract/impl/ContractServiceImpl.java

@@ -302,8 +302,8 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
                         q.eq("c.flow_status", flowStatus);
                     }
                 })
-                .eq(type != null, "m.technology_type", type)
-                .and(q -> q.like("c.code", keyword)
+                .eq(ObjectUtil.isNotEmpty(type), "m.technology_type", type)
+                .and(ObjectUtil.isNotEmpty(keyword), q -> q.like("c.code", keyword)
                         .or().like("cd.apply_purchase_code", keyword)
                         .or().like("m.code", keyword)
                         .or().like("m.name", keyword)

hx-service/storage/src/main/java/com/fjhx/stock/service/impl/StockBackPlanServiceImpl.java

@@ -243,6 +243,7 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
                 .eq("uu.IsDelete", 0)
                 .in("uu.DepartmentID", "A007", "A012")
                 .likeRight("m.Code", "01.")
+                .notIn("m.Code", "01.002.0045", "01.002.0124", "01.002.0381", "01.002.0383")
                 .isNotNull("uu.JobNo"));
 
         for (Map<String, Object> map : pickingList) {
@@ -254,7 +255,7 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
             // 分
 //            int m = Integer.parseInt(DateUtil.format(createTime, "m"));
             // 小于7点30算前一日
-            if (h < 7 ) {
+            if (h < 7) {
                 createTime = DateUtil.offsetDay(createTime, -1);
             }
 
@@ -302,6 +303,7 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
                 .eq("uu.IsDelete", 0)
                 .eq("uu.DepartmentID", "A008")
                 .likeRight("m.Code", "01.")
+                .notIn("m.Code", "01.002.0045", "01.002.0124", "01.002.0381", "01.002.0383")
                 .isNotNull("uu.JobNo"));
 
         for (Map<String, Object> map : pickingList) {
@@ -365,7 +367,9 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
                 .eq("uu.IsDelete", 0)
                 .in("uu.DepartmentID", "A007", "A012")
                 .isNotNull("uu.JobNo")
-                .likeRight("m.Code", "01."));
+                .likeRight("m.Code", "01.")
+                .notIn("m.Code", "01.002.0045", "01.002.0124", "01.002.0381", "01.002.0383")
+        );
 
         for (Map<String, Object> map : backList) {
 
@@ -421,7 +425,9 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
                 .eq("uu.IsDelete", 0)
                 .eq("uu.DepartmentID", "A008")
                 .isNotNull("uu.JobNo")
-                .likeRight("m.Code", "01."));
+                .likeRight("m.Code", "01.")
+                .notIn("m.Code", "01.002.0045", "01.002.0124", "01.002.0381", "01.002.0383")
+        );
 
         for (Map<String, Object> map : backList) {
 
@@ -478,7 +484,9 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
     private void correct(Date beginDate, Map<String, StockBackPlanDetails> stockBackPlanMap) {
         List<Map<String, Object>> correctList = baseMapper.getCorrect(Wrappers.query()
                 .gt("sbc.correct_time", DateUtil.format(beginDate, "yyyy-MM-dd 00:00:00"))
-                .isNotNull("uu.JobNo"));
+                .isNotNull("uu.JobNo")
+                .notIn("m.Code", "01.002.0045", "01.002.0124", "01.002.0381", "01.002.0383")
+        );
         for (Map<String, Object> map : correctList) {
             // 出库时间
             Date createTime = (Date) map.get("createTime");
@@ -510,6 +518,7 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
                 .ge("st.submit_time", DateUtil.format(beginDate, "yyyy-MM-dd 00:00:00"))
                 .eq("st.status", StatusConstant.YES)
                 .eq("st.del_flag", 0)
+                .notIn("m.Code", "01.002.0045", "01.002.0124", "01.002.0381", "01.002.0383")
         );
 
         for (Map<String, Object> map : transferPickingList) {
@@ -571,6 +580,7 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
                 .ge("st.submit_time", DateUtil.format(beginDate, "yyyy-MM-dd 10:00:00"))
                 .eq("st.status", StatusConstant.YES)
                 .eq("st.del_flag", 0)
+                .notIn("m.Code", "01.002.0045", "01.002.0124", "01.002.0381", "01.002.0383")
         );
 
         for (Map<String, Object> map : transferBackList) {