1111

src/main/java/com/th/demo/controller/ware/ChangeController.java

@@ -24,12 +24,13 @@ public class ChangeController {
     @RequestMapping(value = "/changeCustomer.do", method = RequestMethod.POST)
     public String changeCustomer(String json,
                           String customer,
+                          String fkcustomer,
                           String address,
                           HttpServletRequest request) {
         try {
             String userId = (String) request.getAttribute("userId");
             String belongId = (String) request.getAttribute("belongId");
-            result = changeService.changeCustomer(json,  customer,      address,userId,belongId);
+            result = changeService.changeCustomer(json,  customer, fkcustomer, address,userId,belongId);
         } catch (Exception ex) {
             ex.printStackTrace();
             result = JSONTools.toString(ResponseCodeMsg.CODE_EX, ex.getMessage());

src/main/java/com/th/demo/service/impl/ware/ChangeServiceImpl.java

@@ -24,6 +24,7 @@ import com.th.demo.tools.Tools;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.w3c.css.sac.ElementSelector;
 
 import java.util.Collections;
 import java.util.Date;
@@ -48,38 +49,51 @@ public class ChangeServiceImpl implements ChangeService {
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public String changeCustomer(String json, String customer,String address,String userId, String belongId) throws Exception{
+    public String changeCustomer(String json, String customer,String fkcustomer,String address,String userId, String belongId) throws Exception{
         List<Store> list = JSON.parseObject(json, new TypeReference<List<Store>>() {
         });
         Customer c1 = JSON.parseObject(customer, new TypeReference<Customer>() {
         });
-        Customer c = customerMapper.selectByPrimaryKey(c1.getId());
+        Customer fk1 = JSON.parseObject(fkcustomer, new TypeReference<Customer>() {
+        });
+        Customer cNew = customerMapper.selectByPrimaryKey(c1.getId());
+        Customer fkNew = customerMapper.selectByPrimaryKey(fk1.getId());
         String recordType = "";
         for (int i = 0; i < list.size(); i++) {
-            if(list.get(i).getCustomer().getName().equals(c.getName())){
+            if(list.get(i).getCustomer().getName().equals(cNew.getName())){
                 recordType = "0";
             }else {
                 recordType = "1";
                 AccountDetail accountDetail = getAccountDetail(list.get(i),  userId, belongId);
                 num += accountDetailMapper.insert(accountDetail);
             }
-            Customer customer1 = customerMapper.selectByPrimaryKey(list.get(i).getFkComponyId());
-            ChangeRecord changeRecord = getChangeRecord(recordType, list.get(i), c, customer1, address, userId, belongId);
+            Customer fkCustOld = customerMapper.selectByPrimaryKey(list.get(i).getFkComponyId());
+            ChangeRecord changeRecord = getChangeRecord(recordType, list.get(i), cNew,fkNew, fkCustOld, address, userId, belongId);
             num += changeRecordMapper.insert(changeRecord);
 
 
 //            list.get(i).setFkComponyId(list.get(i).getCustomer().getId());
 //            list.get(i).setCustomer(c);
-            list.get(i).setFkComponyId(c.getId());
-            list.get(i).setCustomer(list.get(i).getCustomer());
-            list.get(i).setReceiveAddress(address);
+            list.get(i).setFkComponyId(fkNew.getId());
+            list.get(i).setCustomer(cNew);
+            if (address != null && !address.equals("")){
+                if (address.equals("0")) {
+                    list.get(i).setReceiveAddress("");
+                }else {
+                    list.get(i).setReceiveAddress(address);
+                }
+            }
             list.get(i).setChangeCount(list.get(i).getChangeCount()+1);
             num += storeMapper.updateFKByPKey(list.get(i));
         }
         return Tools.moreThanZeroResultJSON(num);
     }
 
-    private ChangeRecord getChangeRecord(String recordType, Store store, Customer customer, Customer customer1, String receiveAddress, String userId, String belongId) {
+    private ChangeRecord getChangeRecord(String recordType, Store store,
+                                         Customer newCust,
+                                         Customer newFkCust,
+                                         Customer oldFkCust,
+                                         String receiveAddress, String userId, String belongId) {
 
         ChangeRecord record = new ChangeRecord();
         record.setRecordType(recordType);
@@ -89,15 +103,15 @@ public class ChangeServiceImpl implements ChangeService {
         record.setMaterialName(store.getMaterial().getName());
         record.setStandard(store.getMaterial().getStandard());
         record.setModel(store.getModel());
-        if(customer==null) {
+        if(newCust==null) {
             record.setCustomerNameNew("");
         }else {
-            record.setCustomerNameNew(customer.getName());
+            record.setCustomerNameNew(newCust.getName());
         }
         record.setCustomerNameOld(store.getCustomer().getName());
 
-        record.setFkCustomerNameNew(store.getCustomer().getName());
-        record.setFkCustomerNameOld(customer1.getName());
+        record.setFkCustomerNameNew(newFkCust.getName());
+        record.setFkCustomerNameOld(oldFkCust.getName());
 
         record.setCount(store.getCount());
         record.setWeight(store.getWeight());

src/main/java/com/th/demo/service/impl/ware/DistributionServiceImpl.java

@@ -56,6 +56,17 @@ public class DistributionServiceImpl implements DistributionService {
         });
         List<Store> list = JSON.parseObject(jsonList, new TypeReference<List<Store>>() {
         });
+        for (int i = 0 ; i < list.size();i++){
+            // 不同的客户没法配在一起
+            if (!list.get(0).getCustomer().getId().equals(list.get(i).getCustomer().getId())){
+                return JSONTools.toString(1,"不同的客户名称的禁止配在同一车上");
+            }
+            // 不同的货权单位没法配在一起
+            if (!list.get(0).getFkComponyId().equals(list.get(i).getFkComponyId())){
+                return JSONTools.toString(1,"不同的货权单位的禁止配在同一车上");
+            }
+        }
+
         Distribution isExist = distributionMapper.selectByTruckNo(distribution.getTruckNo(), belongId);
         if (isExist == null) {
             distribution.setAddId(userId);
@@ -82,12 +93,15 @@ public class DistributionServiceImpl implements DistributionService {
 
         double cancelWeight = 0;
         double cancelNum = 0;
+        Store store = new Store();
 
         for (int i = 0; i < list.size(); i++) {
             cancelWeight+=list.get(i).getWeight();
             cancelNum+=list.get(i).getCount();
-            list.get(i).setLockFlag("0");
-            num += storeMapper.updateByPrimaryKey(list.get(i));
+            // list.get(i).setLockFlag("0");
+            store = storeMapper.selectByPrimaryKey(list.get(i).getId());
+            store.setLockFlag("0");
+            num += storeMapper.updateByPrimaryKey(store);
         }
         if (distribution.getListDetail().size() == list.size()) {
             distribution.setOutFlag("2");
@@ -117,13 +131,22 @@ public class DistributionServiceImpl implements DistributionService {
     }
 
 public void lockAndInsertDetail(  List<Store> list,  Distribution distribution , String userId, String belongId){
+    Distribution distribution1 = distributionMapper.selectByTruckNo(distribution.getTruckNo(), belongId);
     for (int i = 0; i < list.size(); i++) {
-        list.get(i).setLockFlag("1");
-        num += storeMapper.updateByPrimaryKey(list.get(i));
-        DistributionDetail detail = getDistributionDetail(distribution, list.get(i), userId, belongId);
-        num += distributionDetailMapper.insert(detail);
-        DistributionRecord record  = getDistributionRecord(distribution, list.get(i), "1",userId, belongId);
-        num += distributionRecordMapper.insert(record);
+        Store store = storeMapper.selectByPrimaryKey(list.get(i).getId());
+        // 存在赋值为空的情况，追加一次赋值
+        // 2025.4.20 数据库增加默认为0的修改临时解决，此处其他项目中要注意
+        if (store.getLockFlag() == null || store.getLockFlag() == ""){
+            store.setLockFlag("0");
+        }
+        if (!store.getLockFlag().equals("1") && distribution1.getId() != null && distribution1.getId() != ""){
+            list.get(i).setLockFlag("1");
+            num += storeMapper.updateByPrimaryKey(list.get(i));
+            DistributionDetail detail = getDistributionDetail(distribution1, list.get(i), userId, belongId);
+            num += distributionDetailMapper.insert(detail);
+            DistributionRecord record  = getDistributionRecord(distribution1, list.get(i), "1",userId, belongId);
+            num += distributionRecordMapper.insert(record);
+        }
     }
 }
     public DistributionDetail getDistributionDetail(Distribution distribution, Store store, String userId, String belongId) {

src/main/java/com/th/demo/service/impl/ware/OutServiceImpl.java

@@ -7,6 +7,7 @@ import com.th.demo.mapping.finance.AccountDetailMapper;
 import com.th.demo.mapping.maint.*;
 import com.th.demo.mapping.ware.*;
 import com.th.demo.model.finance.AccountDetail;
+import com.th.demo.model.maint.Customer;
 import com.th.demo.model.maint.Price;
 import com.th.demo.model.maint.Stack;
 import com.th.demo.model.maint.Ware;
@@ -159,7 +160,8 @@ public class OutServiceImpl implements OutService {
                 List<Store> listStore = storeMapper.selectByWareIdStackIdInStoreId(mapParam);
                 if (stack.getIsLayer().equals("0") || stack.getIsLayer().equals("2")) {
                     for (int i = 0; i < listStore.size(); i++) {
-                        OutRecord outRecord = getOutRecord(listStore.get(i), distribution.getId(), "1", userId);
+                        Store store = storeMapper.selectByPrimaryKey(listStore.get(i).getId());
+                        OutRecord outRecord = getOutRecord(store, distribution.getId(), "1", userId);
                         num += outRecordMapper.insert(outRecord);
                         AccountDetail accountDetail = getAccountDetail(listStore.get(i), distribution.getSumWeight(), distribution.getSuttle(), userId, belongId);
                         num += accountDetailMapper.insert(accountDetail);
@@ -174,7 +176,8 @@ public class OutServiceImpl implements OutService {
                     int min = listStore.get(0).getLayer();
                     int max = listStore.get(listStore.size() - 1).getLayer();
                     for (int i = 0; i < listStore.size(); i++) {
-                        OutRecord outRecord = getOutRecord(listStore.get(i), distribution.getId(), "1", userId);
+                        Store store = storeMapper.selectByPrimaryKey(listStore.get(i).getId());
+                        OutRecord outRecord = getOutRecord(store, distribution.getId(), "1", userId);
                         num += outRecordMapper.insert(outRecord);
 
                         AccountDetail accountDetail = getAccountDetail(listStore.get(i), distribution.getSumWeight(), distribution.getSuttle(), userId, belongId);
@@ -232,16 +235,16 @@ public class OutServiceImpl implements OutService {
         accountDetail.setAddTime(new Date());
         accountDetail.setCancelFlag("0");
         accountDetail.setBelongId(belongId);
-        if (suttle == 0) {
-            plateSuttle = 0.0;
-            //storagePrice = price.getStoragePrice() * store.getWeight();
-            weightPrice = 0.0;
-        } else {
-            plateSuttle = suttle / sumWeight * store.getWeight();
-            //storagePrice = price.getStoragePrice() * plateSuttle;
-           // weightPrice = price.getWeightPrice() * plateSuttle;
-        }
-        accountDetail.setSuttle(plateSuttle);
+//        if (suttle == 0) {
+//            plateSuttle = 0.0;
+//            //storagePrice = price.getStoragePrice() * store.getWeight();
+//            weightPrice = 0.0;
+//        } else {
+//            plateSuttle = suttle / sumWeight * store.getWeight();
+//            //storagePrice = price.getStoragePrice() * plateSuttle;
+//           // weightPrice = price.getWeightPrice() * plateSuttle;
+//        }
+//        accountDetail.setSuttle(plateSuttle);
 
         accountDetail.setStoragePrice(storagePrice);
         accountDetail.setWeightPrice(weightPrice);
@@ -264,6 +267,7 @@ public class OutServiceImpl implements OutService {
         outRecord.setStandard(store.getMaterial().getStandard());
         outRecord.setModel(store.getModel());
         outRecord.setCustomerName(store.getCustomer().getName());
+        outRecord.setFkComponyName(store.getFkComponyId());
         if (recordType.equals("0")) {
             outRecord.setCount(-1 * store.getCount());
             outRecord.setWeight(-1 * store.getWeight());

src/main/java/com/th/demo/service/ware/ChangeService.java

@@ -1,6 +1,6 @@
 package com.th.demo.service.ware;
 
 public interface ChangeService {
-    String changeCustomer(String json, String customer,    String address, String userId, String belongId) throws Exception;
+    String changeCustomer(String json, String customer, String fkcustomer,   String address, String userId, String belongId) throws Exception;
 
 }

src/main/resource/mapper/ware/DistributionMapper.xml

@@ -57,7 +57,7 @@
       belong_id ,delivery_company)
     values (#{id,jdbcType=VARCHAR}, #{truckNo,jdbcType=VARCHAR}, #{driverName,jdbcType=VARCHAR},
       #{driverPhone,jdbcType=VARCHAR}, #{sumWeight,jdbcType=DOUBLE}, #{sumCount,jdbcType=DOUBLE}, 
-      #{suttle,jdbcType=DOUBLE}, #{outFlag,jdbcType=VARCHAR}, #{addId,jdbcType=VARCHAR}, 
+      0, #{outFlag,jdbcType=VARCHAR}, #{addId,jdbcType=VARCHAR},
       #{addTime,jdbcType=TIMESTAMP}, #{modifyId,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, 
       #{cancelId,jdbcType=VARCHAR}, #{cancelTime,jdbcType=TIMESTAMP}, #{cancelFlag,jdbcType=VARCHAR}, 
       #{belongId,jdbcType=VARCHAR},#{deliveryCompany,jdbcType=VARCHAR})

src/main/resource/mapper/ware/OutRecordMapper.xml

@@ -125,7 +125,7 @@
       modify_id, modify_time, cancel_id, 
       cancel_time, cancel_flag, belong_id, 
       plate_no,in_id, record_type,back_flag,receive_address,distribution_id
-    ,wgt_dcn_mtc_cd,edge_ty,production_place,tally_people,invoice_price,pack_no,contract_no,ord_no)
+    ,wgt_dcn_mtc_cd,edge_ty,production_place,tally_people,invoice_price,pack_no,contract_no,ord_no,fk_compony_name)
     values (#{id,jdbcType=VARCHAR}, #{wareName,jdbcType=VARCHAR}, #{stackName,jdbcType=VARCHAR}, 
       #{layer,jdbcType=INTEGER}, #{materialName,jdbcType=VARCHAR}, #{materialNo,jdbcType=VARCHAR}, 
       #{standard,jdbcType=VARCHAR}, #{model,jdbcType=VARCHAR}, #{customerName,jdbcType=VARCHAR}, 
@@ -136,7 +136,7 @@
     #{plateNo,jdbcType=VARCHAR},  #{inId,jdbcType=VARCHAR}, #{recordType,jdbcType=VARCHAR},
     #{backFlag,jdbcType=VARCHAR}, #{receiveAddress,jdbcType=VARCHAR}, #{distributionId,jdbcType=VARCHAR}
     ,#{wgtDcnMtcCd,jdbcType=VARCHAR},#{edgeTy,jdbcType=VARCHAR},#{productionPlace,jdbcType=VARCHAR},#{tallyPeople,jdbcType=VARCHAR},#{invoicePrice,jdbcType=DOUBLE},
-    #{packNo,jdbcType=VARCHAR},#{contractNo,jdbcType=VARCHAR},#{ordNo,jdbcType=VARCHAR})
+    #{packNo,jdbcType=VARCHAR},#{contractNo,jdbcType=VARCHAR},#{ordNo,jdbcType=VARCHAR},#{fkComponyName,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.th.demo.model.ware.OutRecord" >
     insert into t_ware_out_record
@@ -484,8 +484,8 @@
     ,(select tt.user_desc as in_user from sys_user tt where tt.id = d.add_id) as in_user,d.car_no as in_car_no
     ,t.invoice_price,t.distribution_id
     from t_ware_out_record t LEFT JOIN sys_user f on t.add_id = f.id
+    LEFT JOIN t_maint_customer e on t.fk_compony_name = e.id
     ,t_ware_distribution p,t_ware_in_record d
-    LEFT JOIN t_maint_customer e on d.fk_compony_name = e.id
 
     where t.ware_name  like concat('%',#{param1,jdbcType=VARCHAR},'%')
     and t.stack_name like concat('%',#{param2,jdbcType=VARCHAR},'%')

src/main/resource/mapper/ware/StoreMapper.xml

@@ -86,7 +86,7 @@
 
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
-    <include refid="Base_Column_List" />
+    *
     from t_ware_store
     where id = #{id,jdbcType=VARCHAR}
   </select>
@@ -381,6 +381,7 @@
     update t_ware_store
     set customer_id = #{customer.id,jdbcType=VARCHAR},
         fk_compony_id = #{fkComponyId,jdbcType=VARCHAR},
+        receive_address = #{receiveAddress,jdbcType=VARCHAR},
         change_count = #{changeCount,jdbcType=DOUBLE}
     where id = #{id,jdbcType=VARCHAR}
   </update>