销售发货，产品调整

gear-mat/pom.xml

@@ -15,6 +15,10 @@
             <groupId>com.gear</groupId>
             <artifactId>gear-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.gear</groupId>
+            <artifactId>gear-system</artifactId>
+        </dependency>
         <dependency>
             <groupId>commons-collections</groupId>
             <artifactId>commons-collections</artifactId>

gear-mat/src/main/java/com/gear/mat/domain/bo/MatMaterialOutBo.java

@@ -67,6 +67,11 @@ public class MatMaterialOutBo extends BaseEntity {
      */
     private String remark;
 
+    /**
+     * 厂家（配料厂家）
+     */
+    private String factory;
+
     /**
      * 开始时间
      */

gear-mat/src/main/java/com/gear/mat/domain/bo/MatProductImportBo.java

@@ -27,4 +27,7 @@ public class MatProductImportBo {
 
     @ExcelProperty("备注")
     private String remark;
+
+    @ExcelProperty("产品图片")
+    private String productImages;
 }

gear-mat/src/main/java/com/gear/mat/domain/bo/MatPurchaseInDetailBo.java

@@ -72,6 +72,11 @@ public class MatPurchaseInDetailBo extends BaseEntity {
      */
     private String remark;
 
+    /**
+     * 厂家（配料厂家）
+     */
+    private String factory;
+
 
     /**
      * 开始时间

gear-mat/src/main/java/com/gear/mat/service/impl/MatMaterialOutServiceImpl.java

@@ -71,6 +71,7 @@ public class MatMaterialOutServiceImpl implements IMatMaterialOutService {
         lqw.eq(StringUtils.isNotBlank(bo.getOperator()), "mmo.operator", bo.getOperator());
         lqw.ge(bo.getBeginTime() != null, "mmo.out_time", bo.getBeginTime());
         lqw.le(bo.getEndTime() != null, "mmo.out_time", bo.getEndTime());
+        lqw.eq(StringUtils.isNotBlank(bo.getFactory()), "mm.factory", bo.getFactory());
         // 逻辑删除
         lqw.eq("mmo.del_flag", 0);
         // 排序

gear-mat/src/main/java/com/gear/mat/service/impl/MatProductServiceImpl.java

@@ -255,6 +255,10 @@ public class MatProductServiceImpl implements IMatProductService {
             data.setModel(model);
             data.setUnitPrice(row.getUnitPrice());
             data.setRemark(row.getRemark());
+            String images = StringUtils.trim(row.getProductImages());
+            if (StringUtils.isNotBlank(images)) {
+                data.setProductImages(images);
+            }
             data.setProductType(normalizeProductType(data.getProductType()));
             data.setCurrentStock(normalizeCurrentStock(data.getCurrentStock()));
             if (exist == null) {

gear-mat/src/main/java/com/gear/mat/service/impl/MatPurchaseInDetailServiceImpl.java

@@ -85,6 +85,7 @@ public class MatPurchaseInDetailServiceImpl implements IMatPurchaseInDetailServi
         qw.ge(bo.getBeginTime() != null, "mpid.in_time", bo.getBeginTime());
         qw.le(bo.getEndTime() != null, "mpid.in_time", bo.getEndTime());
         qw.eq(StringUtils.isNotBlank(bo.getOperator()), "mpid.operator", bo.getOperator());
+        qw.eq(StringUtils.isNotBlank(bo.getFactory()), "mm.factory", bo.getFactory());
         // 逻辑删除
         qw.eq("mpid.del_flag", 0);
         // 排序