1111

src/main/java/com/th/demo/service/impl/maint/MaterialServiceImpl.java

@@ -31,14 +31,22 @@ public class MaterialServiceImpl implements MaterialService {
 
     @Override
     public String query(int page, int rows, String material,String standard, String userId, String belongId) {
-        PageHelper.startPage(page, rows);
         List<Material> list = new ArrayList<Material>();
+        if (page ==-1 && rows ==-1 ){
+            list = materialMapper.select(  material,  standard, belongId);
+
+            result = JSONTools.toString(list);
+            return result;
+        }else {
+            PageHelper.startPage(page, rows);
+            list = materialMapper.select(  material,  standard, belongId);
+
+            PageInfo<Material> pageInfo = new PageInfo<>(list);
+            result = JSONTools.toString(pageInfo);
+            return result;
+        }
 
-        list = materialMapper.select(  material,  standard, belongId);
 
-        PageInfo<Material> pageInfo = new PageInfo<>(list);
-        result = JSONTools.toString(pageInfo);
-        return result;
     }
 
     @Override

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

@@ -24,12 +24,21 @@ public class ChangeRecordServiceImpl implements ChangeRecordService {
 
     @Override
     public String query(int page, int rows, String wareName, String stackName, String model, String materialName, String standard, String customerName, String plateNo, Date fromDate, Date toDate, String userId, String belongId) {
-        PageHelper.startPage(page, rows);
-        List<ChangeRecord> list=changeRecordMapper.select(  wareName,   stackName,model,materialName, standard, customerName,
-                plateNo, fromDate,toDate,  userId,    belongId);
-        PageInfo<ChangeRecord> pageInfo = new PageInfo<>(list);
-        result = JSONTools.toStringyyyyMMddHHmmss(pageInfo);
-        return result;
+        if (page == -1 && rows ==-1){
+            List<ChangeRecord> list=changeRecordMapper.select(  wareName,   stackName,model,materialName, standard, customerName,
+                    plateNo, fromDate,toDate,  userId,    belongId);
+            result = JSONTools.toStringyyyyMMddHHmmss(list);
+            return result;
+        }else {
+            PageHelper.startPage(page, rows);
+            List<ChangeRecord> list=changeRecordMapper.select(  wareName,   stackName,model,materialName, standard, customerName,
+                    plateNo, fromDate,toDate,  userId,    belongId);
+            PageInfo<ChangeRecord> pageInfo = new PageInfo<>(list);
+            result = JSONTools.toStringyyyyMMddHHmmss(pageInfo);
+            return result;
+        }
+
+
     }
 
     @Override

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

@@ -5,9 +5,11 @@ import com.alibaba.fastjson.TypeReference;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.th.demo.mapping.maint.CustomerMapper;
+import com.th.demo.mapping.maint.MaterialMapper;
 import com.th.demo.mapping.maint.StackMapper;
 import com.th.demo.mapping.ware.*;
 import com.th.demo.model.maint.Customer;
+import com.th.demo.model.maint.Material;
 import com.th.demo.model.maint.Stack;
 import com.th.demo.model.system.SysUser;
 import com.th.demo.model.system.Type;
@@ -43,6 +45,8 @@ public class StoreServiceImpl implements StoreService {
     public StackMapper stackMapper;
     @Autowired//自动注入Mapper
     public DistributionDetailMapper distributionDetailMapper;
+    @Autowired//自动注入Mapper
+    public MaterialMapper materialMapper;
     String result = Type.FAIL;
     int num = 0;
 
@@ -77,7 +81,29 @@ public class StoreServiceImpl implements StoreService {
     @Override
     public String modify(String json, String userId, String belongId) {
         Store store = JSON.parseObject(json,Store.class);
-        int num =storeMapper.updateByPrimaryKey(store);
+        Store new_store = storeMapper.selectByPrimaryKey(store.getId());
+        Material material = materialMapper.selectByPrimaryKey(store.getMaterial().getId());
+        Customer customer = customerMapper.selectByName(store.getCustomer().getName(),store.getBelongId());
+        Customer fk_customer = customerMapper.selectByName(store.getFkCustomerName(),store.getBelongId());
+
+        new_store.setMaterial(material);
+        new_store.setModel(store.getModel());
+        new_store.setCount(store.getCount());
+        new_store.setWeight(store.getWeight());
+        new_store.setPlateNo(store.getPlateNo());
+        new_store.setOrdNo(store.getOrdNo());
+        new_store.setContractNo(store.getContractNo());
+        new_store.setPackNo(store.getPackNo());
+        new_store.setProductionPlace(store.getProductionPlace());
+        new_store.setReceiveAddress(store.getReceiveAddress());
+        new_store.setRemark(store.getRemark());
+
+        new_store.setCustomer(customer);
+        new_store.setFkComponyId(fk_customer.getId());
+
+
+        int num =storeMapper.updateByPrimaryKey(new_store);
+        num =storeMapper.updateFKByPKey(new_store);
         result=Tools.moreThanZeroResultJSON(num);
         return result;
     }

src/main/resource/localhost/db.properties

@@ -3,12 +3,12 @@
 #jdbc.user=root
 #jdbc.password=root
 
-#jdbc.driverClass=com.mysql.jdbc.Driver
-#jdbc.jdbcUrl=jdbc:mysql://localhost:3306/ware_zg?characterEncoding=utf8
-#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.jdbcUrl=jdbc:mysql://localhost:3306/ware_zg?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_zg?useUnicode=true&characterEncoding=utf8
+#jdbc.user=root
+#jdbc.password=122403