维多利亚

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/entity/product/ProductInfo.java

@@ -12,7 +12,7 @@ import java.util.Date;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author ${author}
@@ -22,6 +22,10 @@ import java.util.Date;
 @EqualsAndHashCode(callSuper = true)
 public class ProductInfo extends BaseEntity {
 
+    /**
+     * 定义 1物料 2产品
+     */
+    private Integer definition;
 
     /**
      * 产品编码
@@ -119,6 +123,11 @@ public class ProductInfo extends BaseEntity {
     private Date clearancePeriod;
 
     /**
+     * 备注
+     */
+    private String remark;
+
+    /**
      * 逻辑删除 0未删除 1已删除
      */
     @TableField(fill = FieldFill.INSERT)

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/product/ProductInfoMapper.xml

@@ -23,6 +23,7 @@
                clearance_period,
                product_spu_id,
                specs,
+               remark,
                CASE
                    WHEN datediff(now(), computing_time) < new_products_day THEN 1
                    WHEN datediff(now(), computing_time) < (new_products_day + grow_up_day) THEN 2

hx-service/victoriatourist/src/main/java/com/fjhx/service/product/impl/ProductInfoServiceImpl.java

@@ -58,6 +58,7 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
         IWrapper<ProductInfo> wrapper = IWrapper.getWrapper(condition);
         wrapper
                 .keyword(new KeywordData(ProductInfo::getName), new KeywordData(ProductInfo::getCode))
+                .eq(ProductInfo::getDefinition)
                 .eq(ProductInfo::getDeptId)
                 .eq(ProductInfo::getType)
                 .eq(ProductInfo::getClassifyId)
@@ -127,7 +128,9 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
         productInfoVo.setComputingTime(new Date());
 
         synchronized (this) {
-            if (ObjectUtil.equals(productInfoVo.getType(), 1)) {
+            if (productInfoVo.getDefinition() != null && productInfoVo.getDefinition().equals(1)) {
+                productInfoVo.setCode(CodeEnum.MATERIAL.getCode(productInfoVo.getCode()));
+            } else if (ObjectUtil.equals(productInfoVo.getType(), 1)) {
                 productInfoVo.setCode(CodeEnum.PRODUCT_FINISHED.getCode(productInfoVo.getCode()));
             } else {
                 productInfoVo.setCode(CodeEnum.PRODUCT_PARTIALLY_PREPARED.getCode(productInfoVo.getCode()));

hx-service/victoriatourist/src/main/java/com/fjhx/uitl/code/CodeEnum.java

@@ -30,7 +30,8 @@ public enum CodeEnum {
     SPU("SPU", null, "code", 5, ProductSpuService.class),
     //申购单
     APPLY_PURCHASE("AP", "yyyyMM-", "code", 5, ApplyPurchaseService.class),
-
+    // 物料
+    MATERIAL("M", null, "code", 5, ProductInfoService.class),
     // 产品_成品
     PRODUCT_FINISHED("PF", null, "code", 5, ProductInfoService.class),
     // 产品_半成品