问题处理

hx-common/src/main/java/com/fjhx/common/service/file/FtpFileService.java

@@ -1,9 +1,8 @@
 package com.fjhx.common.service.file;
 
 import com.alibaba.fastjson2.JSONObject;
-import org.springframework.stereotype.Service;
 
-@Service
+
 public interface FtpFileService {
     /**
      * 创建临时文件夹

hx-common/src/main/java/com/fjhx/common/service/file/impl/FtpFileServiceImpl.java

@@ -9,12 +9,14 @@ import com.ruoyi.common.exception.ServiceException;
 import org.apache.http.client.entity.UrlEncodedFormEntity;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.message.BasicNameValuePair;
+import org.springframework.stereotype.Service;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+@Service
 public class FtpFileServiceImpl implements FtpFileService {
     /**
      * 创建临时文件夹

hx-sale/src/main/java/com/fjhx/sale/flow/ContractUpdateFlow.java

@@ -123,19 +123,20 @@ public class ContractUpdateFlow extends FlowDelegate {
             if (ObjectUtil.isNotEmpty(newCp.getId())) {//如果新合同产品ID不为空
                 //取出旧合同
                 ContractProduct oldContractProduct = oldContractProductMap.getOrDefault(newCp.getId(), null).get(0);
-                //取出旧合同包装方式
-                JSONObject oldJson = JSONObject.parseObject(oldContractProduct.getEhsdJson());
-                String oldPackMethod = ObjectUtil.isEmpty(oldJson) ? null : oldJson.getString("packMethod");
-                //取出新合同包装方式
-                JSONObject newJson = JSONObject.parseObject(newCp.getEhsdJson());
-                String newPackMethod = ObjectUtil.isEmpty(newJson) ? null : newJson.getString("packMethod");
+//                //取出旧合同包装方式
+//                JSONObject oldJson = JSONObject.parseObject(oldContractProduct.getEhsdJson());
+//                String oldPackMethod = ObjectUtil.isEmpty(oldJson) ? null : oldJson.getString("packMethod");
+//                //取出新合同包装方式
+//                JSONObject newJson = JSONObject.parseObject(newCp.getEhsdJson());
+//                String newPackMethod = ObjectUtil.isEmpty(newJson) ? null : newJson.getString("packMethod");
                 /**
                  * 商品英文名、尺寸、包装方式、数量 没有变更---取原本的剩余数量
                  */
                 if (oldContractProduct.getQuantity().compareTo(newCp.getQuantity()) == 0
                         && StringUtils.equals(oldContractProduct.getProductName(), newCp.getProductName())
                         && StringUtils.equals(oldContractProduct.getProductModel(), newCp.getProductModel())
-                        && StringUtils.equals(oldPackMethod, newPackMethod)) {
+//                        && StringUtils.equals(oldPackMethod, newPackMethod)
+                ) {
                     //取出旧的剩余数量
                     newCp.setExpendQuantity(oldContractProduct.getExpendQuantity());
                 }