1.增加供货商名称

2.增加大洋入库单
3.增加大洋出库单

src/main/java/com/dsic/gj_erp/controller/jcsj/DmBzryController.java

@@ -107,10 +107,20 @@ public class DmBzryController {
     public ResultBean getBzryInsert(@RequestBody List<DmBzry> t, HttpServletRequest request){
         String bzry= (String) request.getAttribute("yhms");
         String bzrq= DateUtil.format(DateUtil.date(), "yyyy/MM/dd");
+        List<DmBzry> list = service.list();
         t.forEach(e->{
             e.setXgrq(bzrq);
             e.setXgry(bzry);
             e.setFlagStatus("1");
+            if ("班长".equals(e.getPosition())){
+                e.setForeman("1");
+            }else{
+                Optional<DmBzry> 班长 = list.stream().filter(item ->
+                        StrUtil.isNotEmpty(item.getZyq()) && item.getZyq().equals(e.getZyq())
+                                && StrUtil.isNotEmpty(item.getResourcesCode()) && item.getResourcesCode().equals(e.getResourcesCode())
+                                && StrUtil.isNotEmpty(item.getPosition()) && item.getPosition().equals("班长")).findFirst();
+                班长.ifPresent(it-> e.setForeman(it.getUserCode()));
+            }
             service.save(e);
         });
 

src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java

@@ -357,13 +357,14 @@ public class ZyjhController {
 //                    wsHandler.sendPwComplete((JSONObject) JSONObject.toJSON(info));
 //                }
                 list.forEach(item-> {
-                    YcldwInfo ycldwInfo = ycldwInfoService.getOne(Wrappers.<YcldwInfo>query()
+                    List<YcldwInfo> ycldwInfoList = ycldwInfoService.list(Wrappers.<YcldwInfo>query()
-                            .select("top 1 *")
                             .eq("ydid", item.getId())
                     );
                     try {
+                        for (YcldwInfo ycldwInfo:ycldwInfoList){
                             ycldwInfoService.updatePw(ycldwInfo);
                             wsHandler.sendPwComplete((JSONObject) JSONObject.toJSON(ycldwInfo));
+                        }
                     }catch (Exception e){
                         wsHandler.sendPwComplete1((JSONObject) JSONObject.toJSON(item));
                     }

src/main/resources/mappers/pbsc/MpYlxxpMapper.xml

@@ -72,8 +72,8 @@
         RTRIM(QC_ZBSDZP.ZBSH) AS ZBSH,
         RTRIM(QC_ZBSDZP.GG) AS GG,
         RTRIM(QC_ZBSDZP.CZ) AS CZ,
-        ZJZT = CASE WHEN LEN(RTRIM(QC_ZBSDZP.ZBSH)) >= 10 THEN 1 ELSE 0 END,
+        CASE WHEN LEN(RTRIM(QC_ZBSDZP.ZBSH)) >= 10 THEN 1 ELSE 0 END ZJZT,
-        FHZT = CASE
+        CASE
         WHEN LEN(RTRIM(QC_ZBSDZP.ZBSH)) >= 10
         AND (RTRIM(MP_DHSJ.dc_tpmc) = RTRIM(QC_ZBSDZP.GG)
         AND RTRIM(MP_DHSJ.dc_tpbh) = RTRIM(QC_ZBSDZP.CZ)) THEN '符合'
@@ -81,20 +81,14 @@
         AND (RTRIM(MP_DHSJ.dc_tpmc) <> RTRIM(QC_ZBSDZP.GG)
         OR RTRIM(MP_DHSJ.dc_tpbh) <> RTRIM(QC_ZBSDZP.CZ)) THEN '不符'
         WHEN LEN(RTRIM(QC_ZBSDZP.ZBSH)) < 10 THEN ''
-        END,
+        END FHZT,
         '' as xz,
         qc_zbsdzp.gdh,
         qc_zbsdzp.ylzd2
         FROM MP_DHSJ
         LEFT JOIN DM_WPJBP ON MP_DHSJ.WPH = DM_WPJBP.WPH
         LEFT JOIN QC_ZBSDZP ON MP_DHSJ.DC_LPH = QC_ZBSDZP.LPH
-
-
-
         where 1=1
-
-
-
         <if test=" dcch!=null and dcch!=''">
             and   MP_DHSJ.DC_CH=#{dcch}
         </if>
@@ -105,7 +99,7 @@
         <if test=" dcpl!=null and dcpl!=''  and  (dcpl1==null or dcpl1=='')  ">
             and   MP_DHSJ.dc_pl=#{dcpl}
         </if>
-
+        order by MP_DHSJ.DC_PL ,MP_DHSJ.DC_TH,MP_DHSJ.WPH
     </select>
 
 </mapper>