Merge remote-tracking branch 'origin/master'

src/main/java/com/dsic/gj_erp/bean/zyjh/YcldwInfo.java

@@ -32,7 +32,7 @@ public class YcldwInfo {
     private String wph;
     private String wlh;
     private String wpgg;
-    private String nm;//内码
+    private String nbsbm;//内码
     private String sljhrq;
     private String qgjhrq;
     private String bfr;//摆放人

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

@@ -5,14 +5,10 @@ import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.dsic.gj_erp.annotation.AuthFunction;
 import com.dsic.gj_erp.bean.ResultBean;
 import com.dsic.gj_erp.bean.jhgk.DmYdjh;
-import com.dsic.gj_erp.bean.jhgk.excel.GdxqExcel;
 import com.dsic.gj_erp.bean.zyjh.PwExcel;
 import com.dsic.gj_erp.bean.zyjh.Ycldw;
 import com.dsic.gj_erp.bean.zyjh.YcldwInfo;

src/main/java/com/dsic/gj_erp/controller/zyjh/dto/ShangLiao.java

@@ -28,7 +28,7 @@ public class ShangLiao {
     private String wph;
     private String wlh;
     private String wpgg;
-    private String nm;//内码
+    private String nbsbm;//内码
     private String sljhrq;
     private String qgjhrq;
     private String bfr;//摆放人

src/main/resources/application-ws.yml

@@ -9,5 +9,5 @@ ws:
   maxHttpContentLength: 1048576
   maxFramePayloadLength: 1048576
   client:
-    url: ws://192.127.2.199:9000
+    url: ws://192.127.2.9:9000
     id: 100000000001

src/main/resources/mappers/zyjh/YcldwMapper.xml

@@ -25,13 +25,15 @@
             <result column="bfrq" property="bfrq" jdbcType="VARCHAR" />
             <result column="zt" property="zt" jdbcType="VARCHAR" />
             <result column="ydid" property="ydid" jdbcType="VARCHAR" />
+            <result column="wlh" property="wlh" jdbcType="VARCHAR" />
+            <result column="nbsbm" property="nbsbm" jdbcType="VARCHAR" />
         </collection>
     </resultMap>
 
     <sql id="ycldwInfo" >
         b.id info_id,b.dw_id info_dw_id,b.ceng info_ceng,b.czbh info_czbh,b.pl info_pl,b.fd info_fd,b.kw info_kw,b.zl info_zl,
             b.tlth info_tlth,b.wpgg info_wpgg,b.wph info_wph,b.sljhrq info_sljhrq,b.qgjhrq info_qgjhrq,b.bfr info_bfr,
-            b.bfrq info_bfrq,b.zt info_zt,b.ydid info_ydid
+            b.bfrq info_bfrq,b.zt info_zt,b.ydid info_ydid,b.wlh info_wlh,b.nbsbm info_nbsbm
     </sql>
 
     <select id="ycldwList" resultMap="ycldwVo">