产品转正接口实现

topsun-xt/src/main/webapp/biz/topsun/product/product.js

@@ -19,6 +19,22 @@ function loadCodeRuleListGrid() {
         },
         disableHandler: disableHandler,
         enableHandler: enableHandler,
+        // 转变为正式产品
+        changeHandler: {
+            id: 'ConversionToOfficialProducts', text: '转为正式产品', img: 'fa-modx', className: 'btn-gray',
+            click: function () {
+                var rows = gridManager.getSelectedRows();
+                var ids = [];
+
+                rows.forEach(row=>{
+                    ids.push(row.productId);
+                })
+                var url = web_app.name + '/product/ConversionToOfficialProducts.ajax';
+                Public.ajax(url, {ids:$.toJSON(ids)}, function () {
+                    reloadGrid();
+                });
+            }
+        }
     });
     gridManager = UICtrl.grid("#productListGrid", {
         columns: [
@@ -43,7 +59,7 @@ function loadCodeRuleListGrid() {
             {display: "ECN号", name: "productAennr", width: 100, minWidth: 60, type: "string", align: "left"},
             {display: "样品编号", name: "productSampleCode", width: 150, minWidth: 60, type: "string", align: "left"},
             {display: "品牌名称", name: "brandName", width: 100, minWidth: 60, type: "string", align: "left"},
-            // { display: "产品类型", name: "prodcutType", width: 140, minWidth: 60, type: "datetime", align: "left" }
+            {display: "产品类型", name: "productType", width: 140, minWidth: 60, type: "string", align: "left"}
         ],
         dataType: "server",
         url: web_app.name + '/product/findProduct.ajax',
@@ -51,7 +67,7 @@ function loadCodeRuleListGrid() {
         usePager: true,
         toolbar: toolbarOptions,
         enabledEdit: true,
-        width: "80%",
+        width: "91.9%",
         height: "100%",
         heightDiff: -8,
         checkbox: true,
@@ -88,21 +104,24 @@ function addHandler() {
 }
 
 //启用
-function enableHandler(){
-    DataUtil.updateById({ action: 'product/updateAProductStatus.ajax',
-        gridManager: gridManager,idFieldName:'productId', param:{status:1},
-        message:'common.confirm.enable',
-        onSuccess:function(){
+function enableHandler() {
+    DataUtil.updateById({
+        action: 'product/updateAProductStatus.ajax',
+        gridManager: gridManager, idFieldName: 'productId', param: {status: 1},
+        message: 'common.confirm.enable',
+        onSuccess: function () {
             reloadGrid();
         }
     });
 }
+
 //禁用
-function disableHandler(){
-    DataUtil.updateById({ action: 'product/updateAProductStatus.ajax',
-        gridManager: gridManager,idFieldName:'productId',param:{status:0},
+function disableHandler() {
+    DataUtil.updateById({
+        action: 'product/updateAProductStatus.ajax',
+        gridManager: gridManager, idFieldName: 'productId', param: {status: 0},
         message: 'common.confirm.disable',
-        onSuccess:function(){
+        onSuccess: function () {
             reloadGrid();
         }
     });

topsun/src/main/java/com/huigou/topsun/product/application/ProductApplication.java

@@ -63,4 +63,6 @@ public interface ProductApplication {
     Map<String,Object> slicedProductList(ProductQueryRequest queryRequest);
 
     void updateAProductStatus(List<String> ids, String  status);
+
+    void ConversionToOfficialProducts(String ids);
 }

topsun/src/main/java/com/huigou/topsun/product/controller/ProductController.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.huigou.context.Operator;
 import com.huigou.topsun.product.application.*;
 import com.huigou.topsun.product.domain.*;
 import com.huigou.topsun.product.domain.query.ProductQueryRequest;
@@ -224,6 +225,13 @@ public class ProductController extends CommonController {
         productService.updateAProductStatus(ids,status);
         return success();
     }
+
+    public String ConversionToOfficialProducts(){
+        SDO sdo = this.getSDO();
+        String ids = sdo.getString("ids");
+        productService.ConversionToOfficialProducts(ids);
+        return success();
+    }
 }
 
 //// 通过此方法可以查看系统配置的 字典 的数据结构

topsun/src/main/java/com/huigou/topsun/product/domain/vo/ProductReturn.java

+package com.huigou.topsun.product.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * title: 转正数据传SAP接口
+ * author:ZHT
+ * date:2024/1/8
+ * description:
+ */
+public class ProductReturn implements Serializable {
+    /**
+     * 产品编码
+     */
+    @JsonProperty("MATNR")
+    private String productCode;
+
+    /**
+     * 产品名称
+     */
+    @JsonProperty(value = "MAKTX",required = true)
+    private String productName;
+
+    /**
+     * 产品数量
+     */
+    @JsonProperty(value = "BMENG",required = true)
+    private String productNumber;
+
+    /**
+     * 产品计量单位
+     */
+    @JsonProperty(value = "BMEIN",required = true)
+    private String productUnit;
+
+    /**
+     * BOM有效起始日期
+     */
+    @JsonProperty(value = "DATUV",required = true)
+    private Date productDatuy;
+
+    /**
+     * ECN号
+     */
+    @JsonProperty(value = "AENNR",required = true)
+    private String productAennr;
+
+    /**
+     * 单层厚(单位丝)
+     */
+    @JsonProperty(value = "ZDCH",required = true)
+    private Integer productSingleLayer;
+
+    /**
+     * 单重(单位KG)
+     */
+    @JsonProperty(value = "ZDANZ",required = true)
+    private Double productSingleWeight;
+
+    /**
+     * 行数
+     */
+    @JsonProperty(value = "ZPBHS",required = true)
+    private Integer rowNum;
+
+    /**
+     * 派工倍数
+     */
+    @JsonProperty(value = "ZPGBS",required = true)
+    private Integer dispatchMultiple;
+
+    /**
+     * 更新标识
+     */
+    @JsonProperty(required = true)
+    private String  UPDKZ;
+
+    /**
+     * bom结点
+     */
+    private List<Map<String ,Object >> BOMItems;
+
+    public String getProductCode() {
+        return productCode;
+    }
+
+    public void setProductCode(String productCode) {
+        this.productCode = productCode;
+    }
+
+    public String getProductName() {
+        return productName;
+    }
+
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
+    public String getProductNumber() {
+        return productNumber;
+    }
+
+    public void setProductNumber(String productNumber) {
+        this.productNumber = productNumber;
+    }
+
+    public String getProductUnit() {
+        return productUnit;
+    }
+
+    public void setProductUnit(String productUnit) {
+        this.productUnit = productUnit;
+    }
+
+    public Date getProductDatuy() {
+        return productDatuy;
+    }
+
+    public void setProductDatuy(Date productDatuy) {
+        this.productDatuy = productDatuy;
+    }
+
+    public String getProductAennr() {
+        return productAennr;
+    }
+
+    public void setProductAennr(String productAennr) {
+        this.productAennr = productAennr;
+    }
+
+    public Integer getProductSingleLayer() {
+        return productSingleLayer;
+    }
+
+    public void setProductSingleLayer(Integer productSingleLayer) {
+        this.productSingleLayer = productSingleLayer;
+    }
+
+    public Double getProductSingleWeight() {
+        return productSingleWeight;
+    }
+
+    public void setProductSingleWeight(Double productSingleWeight) {
+        this.productSingleWeight = productSingleWeight;
+    }
+
+    public Integer getRowNum() {
+        return rowNum;
+    }
+
+    public void setRowNum(Integer rowNum) {
+        this.rowNum = rowNum;
+    }
+
+    public Integer getDispatchMultiple() {
+        return dispatchMultiple;
+    }
+
+    public void setDispatchMultiple(Integer dispatchMultiple) {
+        this.dispatchMultiple = dispatchMultiple;
+    }
+
+    public String getUPDKZ() {
+        return UPDKZ;
+    }
+
+    public void setUPDKZ(String UPDKZ) {
+        this.UPDKZ = UPDKZ;
+    }
+
+    public List<Map<String, Object>> getBOMItems() {
+        return BOMItems;
+    }
+
+    public void setBOMItems(List<Map<String, Object>> BOMItems) {
+        this.BOMItems = BOMItems;
+    }
+
+    public ProductReturn() {
+    }
+
+    public ProductReturn(String productCode, String productName, String productNumber, String productUnit, Date productDatuy, String productAennr, Integer productSingleLayer, Double productSingleWeight, Integer rowNum, Integer dispatchMultiple, String UPDKZ, List<Map<String, Object>> BOMItems) {
+        this.productCode = productCode;
+        this.productName = productName;
+        this.productNumber = productNumber;
+        this.productUnit = productUnit;
+        this.productDatuy = productDatuy;
+        this.productAennr = productAennr;
+        this.productSingleLayer = productSingleLayer;
+        this.productSingleWeight = productSingleWeight;
+        this.rowNum = rowNum;
+        this.dispatchMultiple = dispatchMultiple;
+        this.UPDKZ = UPDKZ;
+        this.BOMItems = BOMItems;
+    }
+}

topsun/src/main/java/com/huigou/topsun/proofing/domain/proofingMake/model/ProofingMakeReturn.java

@@ -14,7 +14,6 @@ import java.util.Map;
  * date:2024/1/8
  * description:
  */
-@Data
 public class ProofingMakeReturn implements Serializable {
     /**
      * 产品编码
@@ -87,4 +86,117 @@ public class ProofingMakeReturn implements Serializable {
      */
     private List<Map<String ,Object >> BOMItems;
 
+    public ProofingMakeReturn() {
+    }
+
+    public ProofingMakeReturn(String productCode, String productName, String productNumber, String productUnit, Date productDatuy, String productAennr, Integer productSingleLayer, Double productSingleWeight, Integer rowNum, Integer dispatchMultiple, String UPDKZ, List<Map<String, Object>> BOMItems) {
+        this.productCode = productCode;
+        this.productName = productName;
+        this.productNumber = productNumber;
+        this.productUnit = productUnit;
+        this.productDatuy = productDatuy;
+        this.productAennr = productAennr;
+        this.productSingleLayer = productSingleLayer;
+        this.productSingleWeight = productSingleWeight;
+        this.rowNum = rowNum;
+        this.dispatchMultiple = dispatchMultiple;
+        this.UPDKZ = UPDKZ;
+        this.BOMItems = BOMItems;
+    }
+
+    public String getProductCode() {
+        return productCode;
+    }
+
+    public void setProductCode(String productCode) {
+        this.productCode = productCode;
+    }
+
+    public String getProductName() {
+        return productName;
+    }
+
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
+    public String getProductNumber() {
+        return productNumber;
+    }
+
+    public void setProductNumber(String productNumber) {
+        this.productNumber = productNumber;
+    }
+
+    public String getProductUnit() {
+        return productUnit;
+    }
+
+    public void setProductUnit(String productUnit) {
+        this.productUnit = productUnit;
+    }
+
+    public Date getProductDatuy() {
+        return productDatuy;
+    }
+
+    public void setProductDatuy(Date productDatuy) {
+        this.productDatuy = productDatuy;
+    }
+
+    public String getProductAennr() {
+        return productAennr;
+    }
+
+    public void setProductAennr(String productAennr) {
+        this.productAennr = productAennr;
+    }
+
+    public Integer getProductSingleLayer() {
+        return productSingleLayer;
+    }
+
+    public void setProductSingleLayer(Integer productSingleLayer) {
+        this.productSingleLayer = productSingleLayer;
+    }
+
+    public Double getProductSingleWeight() {
+        return productSingleWeight;
+    }
+
+    public void setProductSingleWeight(Double productSingleWeight) {
+        this.productSingleWeight = productSingleWeight;
+    }
+
+    public Integer getRowNum() {
+        return rowNum;
+    }
+
+    public void setRowNum(Integer rowNum) {
+        this.rowNum = rowNum;
+    }
+
+    public Integer getDispatchMultiple() {
+        return dispatchMultiple;
+    }
+
+    public void setDispatchMultiple(Integer dispatchMultiple) {
+        this.dispatchMultiple = dispatchMultiple;
+    }
+
+    public String getUPDKZ() {
+        return UPDKZ;
+    }
+
+    public void setUPDKZ(String UPDKZ) {
+        this.UPDKZ = UPDKZ;
+    }
+
+    public List<Map<String, Object>> getBOMItems() {
+        return BOMItems;
+    }
+
+    public void setBOMItems(List<Map<String, Object>> BOMItems) {
+        this.BOMItems = BOMItems;
+    }
 }