1.25

src/main/java/com/steerinfo/dil/controller/RmsSupplierController.java

@@ -96,8 +96,8 @@ public class RmsSupplierController extends BaseRESTfulController {
     })
     //@RequiresPermissions("rmssupplier:update")
     @PostMapping(value = "/updateSupplier", produces  = "application/json;charset=UTF-8")
-    public RESTfulResult updateSupplier(@RequestBody RmsSupplier rmsSupplier){
-        int result= rmsSupplierService.updateSupplier(rmsSupplier);
+    public RESTfulResult updateSupplier(@RequestBody Map<String,Object> map) throws ParseException {
+        int result= rmsSupplierService.updateSupplier(map);
         return success(result);
     }
 

src/main/java/com/steerinfo/dil/service/IRmsSupplierService.java

@@ -29,7 +29,7 @@ public interface IRmsSupplierService {
 //增加供应商
     int  insertSupplier(Map<String, Object> mapValue) throws ParseException;
 //更新供应商
-    int updateSupplier(RmsSupplier rmsSupplier);
+    int updateSupplier(Map<String,Object> map) throws ParseException;
 //删除供应商
     int deleteSupplier(BigDecimal id);
 //根据id获取详细供应商

src/main/java/com/steerinfo/dil/service/impl/RmsConsigneeServiceImpl.java

@@ -107,18 +107,25 @@ public class RmsConsigneeServiceImpl implements IRmsConsigneeService {
         String consigneeRegisteredAddress=(String) mapVal.get("consigneeRegisteredAddress");
         String consigneeReceiveAddress=(String) mapVal.get("consigneeReceiveAddress");
         String consigneeRegistrationTime=(String)mapVal.get("consigneeRegistrationTime");
-        Date time = simpleDateFormat.parse(consigneeRegistrationTime);
+        RmsConsignee rmsConsignee=new RmsConsignee();
+        if(consigneeRegistrationTime!=null){
+            Date time = simpleDateFormat.parse(consigneeRegistrationTime);
+            rmsConsignee.setConsigneeRegistrationTime(time);
+        }else{
+            rmsConsignee.setConsigneeRegistrationTime(new Date());
+        }
+
         String consigneeContactName=(String) mapVal.get("consigneeContactName");
         String consigneeContactTel=(String)mapVal.get("consigneeContactTel");
         //收货客户父节点
         BigDecimal consigneeFarId=DataChange.dataToBigDecimal(mapVal.get("consigneeFarId"));
-        RmsConsignee rmsConsignee=new RmsConsignee();
+
         rmsConsignee.setConsigneeId(consigneeId);
         rmsConsignee.setConsigneeCompanyName(companyName);
         rmsConsignee.setConsigneeAbbreviation(consigneeAbbreviation);
         rmsConsignee.setConsigneeRegisteredAddress(consigneeRegisteredAddress);
         rmsConsignee.setConsigneeReceiveAddress(consigneeReceiveAddress);
-        rmsConsignee.setConsigneeRegistrationTime(time);
+
         rmsConsignee.setConsigneeContactName(consigneeContactName);
         rmsConsignee.setConsigneeContactTel(consigneeContactTel);
         rmsConsignee.setConsigneeFarId(consigneeFarId);

src/main/java/com/steerinfo/dil/service/impl/RmsSupplierServiceImpl.java

@@ -156,11 +156,27 @@ public class RmsSupplierServiceImpl implements IRmsSupplierService {
 
     /**
      * 修改供应商信息
-     * @param rmsSupplier
+     * @param
      * @return
      */
     @Override
-    public int updateSupplier(RmsSupplier rmsSupplier) {
+    public int updateSupplier(Map<String,Object> map) throws ParseException {
+        RmsSupplier rmsSupplier =new RmsSupplier();
+        rmsSupplier.setSupplierId(DataChange.dataToBigDecimal(map.get("supplierOfId")));
+        rmsSupplier.setSupplierName((String) map.get("supplierName"));
+        rmsSupplier.setSupplierAddress((String)map.get("supplierAddress"));
+        rmsSupplier.setSupplierContactsName((String)map.get("supplierContactsName"));
+        rmsSupplier.setSupplierContactNumber((String)map.get("supplierContactNumber"));
+        String supplierRegisterDate = (String)map.get("supplierRegisterDate");
+        //父节点
+        rmsSupplier.setSupplierFarId(DataChange.dataToBigDecimal(map.get("supplierIds")));
+        if(supplierRegisterDate!=null) {
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+            Date registerDate = simpleDateFormat.parse(supplierRegisterDate);
+            rmsSupplier.setSupplierRegisterDate(registerDate);
+        }else{
+            rmsSupplier.setSupplierRegisterDate(new Date());
+        }
         rmsSupplier.setUpdateUsername("admin");
 //        增加修改时间
         rmsSupplier.setUpdateTime(new Date());

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1/rms
 spring:
   profiles:
-    include: ${SPRING_PROFILES:prod}
+    include: ${SPRING_PROFILES:dev}
   jackson:
       date-format: yyyy-MM-dd HH:mm:ss
       time-zone: GMT+8

src/main/resources/com/steerinfo/dil/mapper/RmsSupplierMapper.xml

@@ -1001,8 +1001,12 @@
       RS.SUPPLIER_ADDRESS AS "supplierAddress",
       RS.SUPPLIER_REGISTER_DATE AS "supplierRegisterDate",
       RS.SUPPLIER_CONTACTS_NAME AS "supplierContactsName",
-      RS.SUPPLIER_CONTACT_NUMBER AS "supplierContactNumber"
+      RS.SUPPLIER_CONTACT_NUMBER AS "supplierContactNumber",
+      RS1.SHIPPER_ID AS "shipperId",
+      RS1.SHIPPER_NAME AS "farName"
     FROM RMS_SUPPLIER RS
+    LEFT JOIN RMS_SHIPPER RS1
+    ON RS1.SHIPPER_ID=RS.SUPPLIER_FAR_ID
     WHERE RS.SUPPLIER_ID=#{id}
   </select>
   <!--  根据名称查询当前表中相对应的供应商的数量-->