wms

src/main/java/org/rcisoft/bus/wmsgoods/entity/WmsGoods.java

@@ -89,6 +89,7 @@ public class WmsGoods  extends CyIdIncreEntity<WmsGoods> {
       */
      @Excel(name = "品牌", orderNum = "8", width = 20)
      private String goodsBrand;
-
+     @Excel(name = "商品名称", orderNum = "9", width = 20)
+     private String goodsDictName;
 }
 

src/main/java/org/rcisoft/bus/wmsgoodsapply/controller/WmsGoodsApplyController.java

@@ -218,10 +218,10 @@ public class WmsGoodsApplyController extends CyPaginationController<WmsGoodsAppl
 
             DictDataDTO dictData6 = new DictDataDTO();
             dictData1.setFlag("1");
-            dictData1.setDictType("GOODS_NAME");
+            dictData1.setDictType("GOODS_DICT_NAME");
             List<DictData> dictDataList6 = dictDataRepository.querySysDictDatas(dictData6);
-            String[] goodsName= dictDataList6.stream().map(DictData::getDictLabel).toArray(String[]::new);
-            ExportExcelUtil.XSSFSetDropDownAndHidden(goodsName,workbook,sheet,1, 100000, 7, 7);
+            String[] goodsDictName= dictDataList6.stream().map(DictData::getDictLabel).toArray(String[]::new);
+            ExportExcelUtil.XSSFSetDropDownAndHidden(goodsDictName,workbook,sheet,1, 100000, 7, 7);
 
             DictDataDTO dictData7 = new DictDataDTO();
             dictData1.setFlag("1");

src/main/java/org/rcisoft/bus/wmsgoodsapply/entity/WmsGoodsApply.java

@@ -162,7 +162,10 @@ public class WmsGoodsApply  extends CyIdIncreEntity<WmsGoodsApply> {
      */
      @Excel(name = "制单员", orderNum = "17", width = 20)
      private String maker;
-
+     @Excel(name = "入库", orderNum = "17", width = 20)
+     private String inGoods;
+     @Excel(name = "出库", orderNum = "17", width = 20)
+     private String outGoods;
 
 }
 

src/main/java/org/rcisoft/bus/wmsgoodsstock/dto/WmsGoodsStockPageResultsDto.java

@@ -20,6 +20,7 @@ public class WmsGoodsStockPageResultsDto extends WmsGoodsStock {
      * @default
      */
     private String goodsName;
+    private String goodsDictName;
 
     /**
      * @desc 商品编码

src/main/resources/mapper/bus/wmsGoods/WmsGoodsMapper.xml

@@ -12,6 +12,7 @@
         <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/>
         <result column="remarks" jdbcType="VARCHAR" property="remarks"/>
         <result column="goods_name" jdbcType="VARCHAR" property="goodsName"/>
+        <result column="goods_dict_name" jdbcType="VARCHAR" property="goodsDictName"/>
         <result column="goods_code" jdbcType="VARCHAR" property="goodsCode"/>
         <result column="goods_style" jdbcType="VARCHAR" property="goodsStyle"/>
         <result column="goods_art_number" jdbcType="VARCHAR" property="goodsArtNumber"/>
@@ -33,6 +34,9 @@
         <if test="entity.goodsName !=null and entity.goodsName != '' ">
             and goods_name like concat('%',#{entity.goodsName},'%')
         </if>
+        <if test="entity.goodsDictName !=null and entity.goodsDictName != '' ">
+            and goods_dict_name like concat('%',#{entity.goodsDictName},'%')
+        </if>
         <if test="entity.goodsCode !=null and entity.goodsCode != '' ">
             and goods_code like concat('%',#{entity.goodsCode},'%')
         </if>
@@ -70,6 +74,9 @@
         <if test="entity.goodsName !=null and entity.goodsName != '' ">
             and goods_name like concat('%',#{entity.goodsName},'%')
         </if>
+        <if test="entity.goodsDictName !=null and entity.goodsDictName != '' ">
+            and goods_dict_name like concat('%',#{entity.goodsDictName},'%')
+        </if>
         <if test="entity.goodsCode !=null and entity.goodsCode != '' ">
             and goods_code like concat('%',#{entity.goodsCode},'%')
         </if>

src/main/resources/mapper/bus/wmsGoodsApply/WmsGoodsApplyMapper.xml

@@ -29,6 +29,8 @@
         <result column="goods_check" jdbcType="CHAR" property="goodsCheck"/>
         <result column="salesman" jdbcType="VARCHAR" property="salesman"/>
         <result column="maker" jdbcType="VARCHAR" property="maker"/>
+        <result column="in_goods" jdbcType="VARCHAR" property="inGoods"/>
+        <result column="out_goods" jdbcType="VARCHAR" property="outGoods"/>
     </resultMap>
     <insert id="batchAdd">insert into wms_goods_apply(flag,del_flag,create_by,create_date,update_by,update_date,remarks,goods_code,goods_type,goods_article_number,goods_subclass,
         goods_colour,goods_norms,goods_size,io_type,deal_status,sure_status,goods_counts,shipper,shipper_address,shipper_phone,goods_check,salesman,maker) values

src/main/resources/mapper/bus/wmsGoodsStock/WmsGoodsStockMapper.xml

@@ -27,6 +27,7 @@
         <result column="goods_id" jdbcType="INTEGER" property="goodsId"/>
         <result column="goods_counts" jdbcType="INTEGER" property="goodsCounts"/>
         <result column="goods_name" jdbcType="VARCHAR" property="goodsName"/>
+        <result column="goods_dict_name" jdbcType="VARCHAR" property="goodsDictName"/>
         <result column="goods_code" jdbcType="VARCHAR" property="goodsCode"/>
         <result column="goods_style" jdbcType="VARCHAR" property="goodsStyle"/>
         <result column="goods_art_number" jdbcType="VARCHAR" property="goodsArtNumber"/>
@@ -41,6 +42,7 @@
     <select id="queryWmsGoodsStocks" resultMap="BaseResultMap">
         select wgs.*,
         wg.goods_name,
+        wg.goods_dict_name,
         wg.goods_code,
         wg.goods_style,
         wg.goods_art_number,
@@ -68,6 +70,7 @@
         SELECT
         wgs.*,
         wg.goods_name,
+        wg.goods_dict_name,
         wg.goods_code,
         wg.goods_style,
         wg.goods_art_number,
@@ -90,6 +93,12 @@
         <if test="entity.goodsCounts !=null and entity.goodsCounts != '' ">
             and wgs.goods_counts = #{entity.goodsCounts}
         </if>
+        <if test="entity.goodsName !=null and entity.goodsName != '' ">
+            and wg.goods_name = #{entity.goodsName}
+        </if>
+        <if test="entity.goodsDictName !=null and entity.goodsDictName != '' ">
+            and wg.goods_dict_name = #{entity.goodsDictName}
+        </if>
         <if test="entity.goodsCode !=null and entity.goodsCode != '' ">
             and wg.goods_code = #{entity.goodsCode}
         </if>