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

@@ -204,4 +204,38 @@ public class StoreController {
         }
     }
 
+    @RequestMapping(value = "/lockAndUnlock.do")
+    public String lockAndUnlock(String json,String lockFlag,
+                              HttpServletRequest request) {
+
+        try {
+            String userId = (String) request.getAttribute("userId");
+            String belongId = (String) request.getAttribute("belongId");
+            result=storeService.lockAndUnlock(json,lockFlag,userId,belongId);
+
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            result = JSONTools.toString(ResponseCodeMsg.CODE_EX, ex.getMessage());
+        } finally {
+            return result;
+        }
+    }
+
+    @RequestMapping(value = "/Outbound.do")
+    public String Outbound(String json,String outbound,
+                       HttpServletRequest request) {
+
+        try {
+            String userId = (String) request.getAttribute("userId");
+            String belongId = (String) request.getAttribute("belongId");
+            result=storeService.Outbound(json,outbound,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/DistributionDetailMapper.java

@@ -21,4 +21,6 @@ public interface DistributionDetailMapper {
    List<DistributionDetail> selectByFid(String distributionId);
 
     int updateCancelFlagById(Map<String,Object> map);
+
+    List<DistributionDetail> selectByStoreId(String storeId);
 }

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

@@ -57,4 +57,6 @@ public interface StoreMapper {
     void updateByOutId(String id, String noUserParam, String userId, String belongId);
 
     int updateFKByPKey(Store store);
+
+    int updateOutBoundByPrimaryKey(Store record);
 }

src/main/java/com/th/demo/model/ware/Store.java

@@ -102,6 +102,8 @@ public class Store  implements Comparable<Store>{
 
     private String payWay;
 
+    private String OutBound;
+
 
     public Double getInvoicePrice() {
         return invoicePrice;
@@ -576,6 +578,14 @@ public class Store  implements Comparable<Store>{
         this.changeCount = changeCount;
     }
 
+    public String getOutBound() {
+        return OutBound;
+    }
+
+    public void setOutBound(String outBound) {
+        OutBound = outBound;
+    }
+
     @Override
     public int compareTo(Store o) {
         if (this.layer > o.getLayer()) {

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

@@ -6,10 +6,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.th.demo.mapping.maint.CustomerMapper;
 import com.th.demo.mapping.maint.StackMapper;
-import com.th.demo.mapping.ware.ChangeRecordMapper;
-import com.th.demo.mapping.ware.InRecordMapper;
-import com.th.demo.mapping.ware.MoveRecordMapper;
-import com.th.demo.mapping.ware.StoreMapper;
+import com.th.demo.mapping.ware.*;
 import com.th.demo.model.maint.Customer;
 import com.th.demo.model.maint.Stack;
 import com.th.demo.model.system.SysUser;
@@ -43,6 +40,8 @@ public class StoreServiceImpl implements StoreService {
     public MoveRecordMapper moveRecordMapper;
     @Autowired//自动注入Mapper
     public StackMapper stackMapper;
+    @Autowired//自动注入Mapper
+    public DistributionDetailMapper distributionDetailMapper;
     String result = Type.FAIL;
     int num = 0;
 
@@ -391,6 +390,39 @@ public class StoreServiceImpl implements StoreService {
         return result;
     }
 
+    @Override
+    public String lockAndUnlock(String json,String lockFlag,String userId,String belongId) {
+        List<Store> listStore = JSON.parseObject(json, new TypeReference<List<Store>>() {});
+        if (lockFlag.equals("0")  ){
+            for (int i = 0; i < listStore.size(); i++) {
+                List<DistributionDetail> distributionDetailList = distributionDetailMapper.selectByStoreId(listStore.get(i).getId());
+                if (distributionDetailList.size()>0){
+                    return JSONTools.toString(1,"存在配车封锁，此类封锁无法解封，请配车取消解除封锁");
+                }
+                listStore.get(i).setLockFlag(lockFlag);
+                num += storeMapper.updateByPrimaryKey(listStore.get(i));
+            }
+        } else if (lockFlag.equals("1")) {
+            for (int i = 0; i < listStore.size(); i++) {
+                listStore.get(i).setLockFlag(lockFlag);
+                num += storeMapper.updateByPrimaryKey(listStore.get(i));
+            }
+        }
+        result = Tools.moreThanZeroResultJSON(num);
+        return result;
+    }
+
+    @Override
+    public String Outbound(String json,String outbound,String userId,String belongId) {
+        List<Store> listStore = JSON.parseObject(json, new TypeReference<List<Store>>() {});
+        for (int i = 0; i < listStore.size(); i++) {
+            listStore.get(i).setOutBound(outbound);
+            num += storeMapper.updateOutBoundByPrimaryKey(listStore.get(i));
+        }
+        result = Tools.moreThanZeroResultJSON(num);
+        return result;
+    }
+
     private MoveRecord getMoveRecord(Store store, Stack fromStack, Stack toStack, int layerNew, int layerOld, String userId) {
         MoveRecord moveRecord = new MoveRecord();
         moveRecord.setWareNameOld(fromStack.getWare().getName());

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

@@ -32,4 +32,8 @@ public interface StoreService {
 
     String changeStack(String json,String newWare,String newStack,String newRemark1,
                        String newRemark, String userId,String belongId);
+
+    String lockAndUnlock(String json,String lockFlag,String userId,String belongId);
+
+    String Outbound(String json,String outbound,String userId,String belongId);
 }

src/main/resource/localhost/db.properties

@@ -8,7 +8,7 @@
 #jdbc.user=root
 #jdbc.password=root
 
-jdbc.driverClass=com.mysql.jdbc.Driver
-jdbc.jdbcUrl=jdbc:mysql://60.205.9.174:3309/ware_zg?useUnicode=true&characterEncoding=utf8
-jdbc.user=root
-jdbc.password=122403
+#jdbc.driverClass=com.mysql.jdbc.Driver
+#jdbc.jdbcUrl=jdbc:mysql://60.205.9.174:3309/ware_zg?useUnicode=true&characterEncoding=utf8
+#jdbc.user=root
+#jdbc.password=122403

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

@@ -115,4 +115,11 @@
     and ifnull(cancel_flag,'0') = '0'
   </select>
 
+  <select id="selectByStoreId" resultMap="BaseResultMap">
+    select *
+    from t_ware_distribution_detail
+    where store_id = #{param1,jdbcType=VARCHAR}
+    and ifnull(cancel_flag,'0') = '0'
+  </select>
+
 </mapper>

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

@@ -55,6 +55,8 @@
 
     <result column="change_count" property="changeCount" jdbcType="DOUBLE" />
 
+    <result column="out_bound" property="outBound" jdbcType="VARCHAR" />
+
 
     <association  column="ware_id" property="ware" select="com.th.demo.mapping.maint.WareMapper.selectByPrimaryKey" />
     <association  column="stack_id" property="stack" select="com.th.demo.mapping.maint.StackMapper.selectByPrimaryKey" />
@@ -616,4 +618,9 @@ update t_ware_store t set t.layer =   #{param7,jdbcType=INTEGER}
       and t.plate_no = #{param1,jdbcType=VARCHAR};
 
   </select>
+
+  <update id="updateOutBoundByPrimaryKey" parameterType="com.th.demo.model.ware.Store" >
+    update  t_ware_store t
+    set t.out_bound = #{outBound,jdbcType=VARCHAR} where t.id = #{id,jdbcType=VARCHAR}
+  </update>
 </mapper>