编辑材料信息

sto/src/main/java/com/shinsoft/sto/controller/ware/ProdMasterController.java

@@ -2,8 +2,10 @@ package com.shinsoft.sto.controller.ware;
 
 import com.alibaba.fastjson.JSON;
 import com.shinsoft.sto.model.system.ResultJSON;
+import com.shinsoft.sto.model.ware.ProdMaster;
 import com.shinsoft.sto.service.ware.ProdMasterService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -33,6 +35,16 @@ public class ProdMasterController {
         }
     }
 
+    @RequestMapping(value = "/edit")
+    public ResultJSON edit(@RequestBody ProdMaster prodMaster) {
+        try {
+            return prodMasterService.edit(prodMaster);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return ResultJSON.error("编辑失败：" + ex.getMessage());
+        }
+    }
+
     @SuppressWarnings("unchecked")
     private Map<String, Object> buildQueryParams(String params, HttpServletRequest request) {
         Map<String, Object> map = new HashMap<>();

sto/src/main/java/com/shinsoft/sto/mapper/ware/ProdMasterMapper.java

@@ -11,6 +11,6 @@ import java.util.Map;
 public interface ProdMasterMapper extends BaseMapper<ProdMaster> {
 
     IPage<ProdMaster> selectProdMasterPage(Page<ProdMaster> page,
-                                          @Param("parms") Map<String, Object> map);
+                                           @Param("parms") Map<String, Object> map);
 }
 

sto/src/main/java/com/shinsoft/sto/mapper/ware/WareStoreMapper.xml

@@ -73,29 +73,34 @@
             ws.stack_id,
             ws.store_id,
             ws.layer_no,
-            w.ware_nm as ware_name,
+            wa.ware_nm as ware_name,
             s.name as stack_name,
             m.material_name,
             pm.st_grade,
             pm.in_dtm,
-            w.ware_nm owner_company,
-            w1.ware_nm receiving_company,
-            w2.ware_nm customer_company,
+            w.CUSTOMER_NM owner_company,
+            w1.CUSTOMER_NM receiving_company,
+            w2.CUSTOMER_NM customer_company,
             pm.prod_no,
             pm.in_truck_no,
-            pm.ATTRIB_01 order_no,
-            pm.ATTRIB_02 contract_no,
+            pm.ATTRIB_01 ,
+            pm.ATTRIB_02 ,
+            pm.ATTRIB_03 ,
+            pm.ATTRIB_04 ,
+            pm.ATTRIB_05 ,
+            pm.remark_1 ,
             pm.weight,
             pm.quantity,
             pm.out_flag,
             pm.delivery_address
         from T_WARE_STORE ws
+        left join T_MAIN_WARE wa on wa.id = ws.ware_id
         left join T_MAIN_STACK s on ws.stack_id = s.id
         left join T_PROD_MASTER pm on ws.store_id = pm.id
         left join T_MAIN_MATERIAL m on pm.material_id = m.id
-        left join T_MAIN_WARE w on w.id = pm.OWNER_COMPANY
-        left join T_MAIN_WARE w1 on w1.id = pm.RECEIVING_COMPANY
-        left join T_MAIN_WARE w2 on w1.id = pm.CUSTOMER_COMPANY
+        left join T_MAIN_CUSTOMER w on w.id = pm.OWNER_COMPANY
+        left join T_MAIN_CUSTOMER w1 on w1.id = pm.RECEIVING_COMPANY
+        left join T_MAIN_CUSTOMER w2 on w2.id = pm.CUSTOMER_COMPANY
         <include refid="QueryWhere"/>
         order by pm.in_dtm desc
     </select>

sto/src/main/java/com/shinsoft/sto/model/ware/ProdMaster.java

@@ -10,7 +10,6 @@ import lombok.experimental.Accessors;
 
 import java.math.BigDecimal;
 import java.util.Date;
-
 @Getter
 @Setter
 @Accessors(chain = true)
@@ -152,6 +151,5 @@ public class ProdMaster extends BaseModel {
 
     @ApiModelProperty("备注信息5")
     private String remark5;
-
 }
 

sto/src/main/java/com/shinsoft/sto/model/ware/WareStoreQueryVO.java

@@ -31,11 +31,18 @@ public class WareStoreQueryVO {
     private String customerCompany;
     private String prodNo;
     private String inTruckNo;
-    private String orderNo;
-    private String contractNo;
+    private String attrib01;
+    private String attrib02;
+    private String attrib03;
+    private String attrib04;
+    private String attrib05;
+    private String remark1;
     private BigDecimal weight;
     private BigDecimal quantity;
     private String outFlag;
     private String deliveryAddress;
 }
 
+
+
+

sto/src/main/java/com/shinsoft/sto/service/impl/ware/ProdMasterServiceImpl.java

@@ -4,12 +4,15 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.shinsoft.sto.mapper.ware.ProdMasterMapper;
+import com.shinsoft.sto.mapper.ware.ChangeRecordMapper;
 import com.shinsoft.sto.model.system.ResponseCodeMsg;
+import com.shinsoft.sto.model.ware.ChangeRecord;
 import com.shinsoft.sto.model.ware.ProdMaster;
 import com.shinsoft.sto.service.ware.ProdMasterService;
-import com.shinsoft.tools.JSONTools;
 import com.shinsoft.sto.model.system.ResultJSON;
 import org.springframework.stereotype.Service;
+import org.springframework.beans.BeanUtils;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Map;
 
@@ -25,6 +28,11 @@ import java.util.Map;
 public class ProdMasterServiceImpl extends ServiceImpl<ProdMasterMapper, ProdMaster> implements ProdMasterService {
 
     ResultJSON resultJSON;
+    private final ChangeRecordMapper changeRecordMapper;
+
+    public ProdMasterServiceImpl(ChangeRecordMapper changeRecordMapper) {
+        this.changeRecordMapper = changeRecordMapper;
+    }
 
     @Override
     public ResultJSON query(int page, int rows, Map<String, Object> map) {
@@ -37,5 +45,64 @@ public class ProdMasterServiceImpl extends ServiceImpl<ProdMasterMapper, ProdMas
             return ResultJSON.error(ResponseCodeMsg.CODE_EX, ex.getMessage());
         }
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ResultJSON edit(ProdMaster prodMaster) {
+        try {
+            if (prodMaster == null || prodMaster.getId() == null || prodMaster.getId().trim().isEmpty()) {
+                return ResultJSON.error("材料ID不能为空");
+            }
+
+            ProdMaster dbData = baseMapper.selectById(prodMaster.getId());
+            if (dbData == null) {
+                return ResultJSON.error("未找到对应的材料信息");
+            }
+
+            // 记录旧数据到变更表
+            ChangeRecord record = new ChangeRecord();
+            BeanUtils.copyProperties(dbData, record);
+            record.setId(null);
+            changeRecordMapper.insert(record);
+
+            // 按需更新字段
+            if (prodMaster.getQuantity() != null) {
+                dbData.setQuantity(prodMaster.getQuantity());
+            }
+            if (prodMaster.getWeight() != null) {
+                dbData.setWeight(prodMaster.getWeight());
+            }
+            if (prodMaster.getAttrib01() != null) {
+                dbData.setAttrib01(prodMaster.getAttrib01());
+            }
+            if (prodMaster.getAttrib02() != null) {
+                dbData.setAttrib02(prodMaster.getAttrib02());
+            }
+            if (prodMaster.getAttrib04() != null) {
+                dbData.setAttrib04(prodMaster.getAttrib04());
+            }
+            if (prodMaster.getAttrib05() != null) {
+                dbData.setAttrib05(prodMaster.getAttrib05());
+            }
+            if (prodMaster.getOwnerCompany() != null) {
+                dbData.setOwnerCompany(prodMaster.getOwnerCompany());
+            }
+            if (prodMaster.getCustomerCompany() != null) {
+                dbData.setCustomerCompany(prodMaster.getCustomerCompany());
+            }
+            if (prodMaster.getDeliveryAddress() != null) {
+                dbData.setDeliveryAddress(prodMaster.getDeliveryAddress());
+            }
+            if (prodMaster.getRemark1() != null) {
+                dbData.setRemark1(prodMaster.getRemark1());
+            }
+
+            baseMapper.updateById(dbData);
+            return ResultJSON.success(dbData);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return ResultJSON.error(ResponseCodeMsg.CODE_EX, ex.getMessage());
+        }
+    }
 }
 

sto/src/main/java/com/shinsoft/sto/service/ware/ProdMasterService.java

@@ -1,8 +1,9 @@
 package com.shinsoft.sto.service.ware;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.shinsoft.sto.model.ware.ProdMaster;
 import com.shinsoft.sto.model.system.ResultJSON;
+import com.shinsoft.sto.model.ware.ProdMaster;
+
 import java.util.Map;
 
 /**
@@ -16,5 +17,12 @@ import java.util.Map;
 public interface ProdMasterService extends IService<ProdMaster> {
 
     ResultJSON query(int page, int rows, Map<String, Object> map);
+
+    /**
+     * 修改材料信息并记录变更
+     */
+    ResultJSON edit(ProdMaster prodMaster);
 }
 
+
+