明晋仓储管理修改内容

出库记录界面增加记录删除功能;（已完成）

库存操作界面调整按钮位置，将"导出记录"按钮移至"修改垛位备注"后面;（已完成）

出库记录界面增加"更多操作"按钮，该按钮中包含"取消出库"和"删除记录"按钮，以及增加确认功能，防止误操作;（已完成）

入库记录界面增加"更多操作"按钮，该按钮中包含"取消出库"和"删除记录"按钮，以及增加确认功能，防止误操作;（已完成）

修复逻辑内容
返修材料可以入库，（已完成）
货权转移的时候无论增加还是减少都不要保留上次的客户名，（已完成）
配货增加限制，防止出现配货配重的情况(已完成)

说明内容：出库记录界面和入库记录界面的删除功能只能删除多余的信息，并不会将正在使用的信息删除
例子，一块板子按照以下次序操作，入库->取消入库->再入库，入库界面出现三条记录，此时全部选中点击删除记录的话，只会删除第一次的入库记录和取消入库的记录，最后一次的入库记录是不会删除的。

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

@@ -125,5 +125,21 @@ public class OutRecordController {
         }
     }
 
+    @RequestMapping(value = "/deleterecord.do" , method = RequestMethod.POST)
+    public String deleterecord(String json,
+                               HttpServletRequest request) {
+
+        try {
+            String userId = (String) request.getAttribute("userId");
+            String belongId = (String) request.getAttribute("belongId");
+            result = outRecordService.deleteRecord(json,userId,belongId);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            result = JSONTools.toString(ResponseCodeMsg.CODE_EX, ex.getMessage());
+        } finally {
+            return result;
+        }
+    }
+
 
 }

src/main/java/com/th/demo/mapping/ware/StoreMapper.java

@@ -57,4 +57,5 @@ public interface StoreMapper {
     int updateFkById(Store store);
 
     int selectByInId(String id);
+    int selectByOutIdNum(String id);
 }

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

@@ -104,13 +104,23 @@ public class DistributionServiceImpl implements DistributionService {
     }
 
 public void lockAndInsertDetail(  List<Store> list,  Distribution distribution , String userId, String belongId){
+    // 重新获取ID，第一次配车的时候会出现没有ID的情况
+    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/InServiceImpl.java

@@ -117,6 +117,8 @@ public class InServiceImpl implements InService {
             }else{
                 storeArray.add(listStore.get(i).getPlateNo());
             }
+            // 修改sql内容判断是否在库的时候增加out_flag的判断
+            // 出过库的可以重复入库
             int effStoreCnt = storeMapper.selEffStore(listStore.get(i).getPlateNo());
             if(effStoreCnt > 0){
                 return JSONTools.toString(1,"库存中已存在板号"+listStore.get(i).getPlateNo()+",请勿重复入库");

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

@@ -7,9 +7,11 @@ import com.github.pagehelper.PageInfo;
 import com.th.demo.mapping.finance.ModPriceLogMapper;
 import com.th.demo.mapping.finance.VerifyAccountMapper;
 import com.th.demo.mapping.ware.OutRecordMapper;
+import com.th.demo.mapping.ware.StoreMapper;
 import com.th.demo.model.finance.ModPriceLog;
 import com.th.demo.model.finance.VerifyAccount;
 import com.th.demo.model.system.Type;
+import com.th.demo.model.ware.InRecord;
 import com.th.demo.model.ware.OutRecord;
 import com.th.demo.model.ware.Store;
 import com.th.demo.model.ware.TotalRecord;
@@ -35,6 +37,8 @@ public class OutRecordServiceImpl implements OutRecordService {
 
     @Autowired
     public ModPriceLogMapper modPriceLogMapper;
+    @Autowired
+    public StoreMapper storeMapper;
 
     String result = Type.FAIL;
     int num = 0;
@@ -162,6 +166,22 @@ public class OutRecordServiceImpl implements OutRecordService {
         }
         return Tools.moreThanZeroResultJSON(num);
     }
+
+    @Override
+    public String deleteRecord(String json, String userId, String belongId){
+        List<OutRecord> outRecords = JSON.parseObject(json, new TypeReference<List<OutRecord>>() {
+        });
+        for (int i = 0; i < outRecords.size(); i++) {
+            int num  =storeMapper.selectByOutIdNum(outRecords.get(i).getId());
+            if(num == 0 ){
+                outRecords.get(i).setCancelFlag("1");
+                num = outRecordMapper.deleteByPrimaryKey(outRecords.get(i).getId());
+            }
+            result = JSONTools.toString(num);
+        }
+
+        return result;
+    }
 }
 
 

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

@@ -14,4 +14,6 @@ public interface OutRecordService {
     String saveVerifyAcc(String json, String accWgt, String accAmt, String invoiceAmt, String accDate, String accReminder, String userId, String belongId);
 
     String savePriceMod(String json, String modPrice, String userId, String belongId);
+
+    String deleteRecord(String json, String userId, String belongId);
 }

src/main/resource/localhost/db.properties

@@ -4,12 +4,12 @@
 #jdbc.password=root
 
 #???????????????????????????????
-jdbc.driverClass=com.mysql.jdbc.Driver
-jdbc.jdbcUrl=jdbc:mysql://localhost:3306/ware_mj?characterEncoding=utf8
-jdbc.user=root
-jdbc.password=root
-
 #jdbc.driverClass=com.mysql.jdbc.Driver
-#jdbc.jdbcUrl=jdbc:mysql://60.205.9.174:3309/ware_mj?useUnicode=true&characterEncoding=utf8
+#jdbc.jdbcUrl=jdbc:mysql://localhost:3306/ware_mj?characterEncoding=utf8
 #jdbc.user=root
-#jdbc.password=122403
+#jdbc.password=root
+
+jdbc.driverClass=com.mysql.jdbc.Driver
+jdbc.jdbcUrl=jdbc:mysql://60.205.9.174:3309/ware_mj?useUnicode=true&characterEncoding=utf8
+jdbc.user=root
+jdbc.password=122403

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

@@ -61,6 +61,7 @@
     from t_ware_cargochange_record
     where uper_customer_id = #{param1,jdbcType=VARCHAR}
     and customer_id = #{param2,jdbcType=VARCHAR}
+    order by modify_time desc
   </select>
 
 

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

@@ -107,10 +107,10 @@
     from t_ware_out_record
     where id = #{id,jdbcType=VARCHAR}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
-    delete from t_ware_out_record
-    where id = #{id,jdbcType=VARCHAR}
-  </delete>
+  <update id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    update t_ware_out_record set cancel_flag = '1'
+    where id = #{param1,jdbcType=VARCHAR}
+  </update>
   <insert id="insert" parameterType="com.th.demo.model.ware.OutRecord" >
     <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.String">
       SELECT  REPLACE(UUID(),'-','') as id from dual

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

@@ -550,6 +550,7 @@ update t_ware_store t set t.layer =   #{param7,jdbcType=INTEGER}
       select count(*)
       from t_ware_store t
       where t.cancel_flag = '0'
+        and IFNULL(t.out_flag,'0') = '0'
       and t.plate_no = #{param1,jdbcType=VARCHAR};
 
   </select>
@@ -566,4 +567,12 @@ update t_ware_store t set t.layer =   #{param7,jdbcType=INTEGER}
       and t.in_id = #{param1,jdbcType=VARCHAR};
 
   </select>
+
+  <select id="selectByOutIdNum" resultType="java.lang.Integer" parameterType="java.lang.String">
+    select COUNT(*)
+    from t_ware_store t
+    where t.cancel_flag = '0'
+      and t.out_id = #{param1,jdbcType=VARCHAR};
+
+  </select>
 </mapper>