'joinapi修改'

pom.xml

@@ -111,7 +111,7 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-                        <table>AMS_PURCHASE_ORDER</table>
+                        <table>RMS_MATERIAL_TYPE</table>
                     </tables>
                 </configuration>
                 <executions>

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

@@ -3,6 +3,8 @@ package com.steerinfo.dil.controller;
 import com.steerinfo.dil.service.impl.AmsSaleOrderServiceImpl;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -44,16 +46,16 @@ public class AmsSaleOrderController extends BaseRESTfulController {
      * @return
      */
     @ApiModelProperty(value = "销售订单管理对接接口/修改")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "saleNumber", value = "WXSDD-20210909-00000001", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "saleAccountBalance", value = "3000", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "saleCurrentOrderAmount", value = "1000", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "saleHistoricalOrderAmount", value = "5000", required = true, dataType = "String"),
+    })
     @PostMapping("/operationSaleOrder")
     public RESTfulResult operationSaleOrder(@RequestBody Map<String, Object> mapVal) {
         int result = amsSaleOrderService.operationSaleOrder(mapVal);
         return success(result);
     }
 
-
-
-
-
-
-
 }

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

@@ -26,12 +26,12 @@ public class BmsportHandlingFeeController extends BaseRESTfulController {
     BmsportHandlingFeeServiceImpl bmsportHandlingFeeService;
 
     /**
-     * 销售汽运账单接口
+     * 港口装卸费结算接口
      *
      * @param feeId
      * @return
      */
-    @ApiModelProperty(value = "销售汽运账单接口")
+    @ApiModelProperty(value = "港口装卸费结算接口")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "feeId", value = "港口装卸费主键id", required = true, dataType = "Integer"),
     })

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

@@ -39,8 +39,8 @@ public class BmstrainDetailsOrderController extends BaseRESTfulController {
     })
     @PostMapping("/getPurchaseTrainDetailsOrder")
     public List<Map<String, Object>> getPurchaseTrainDetailsOrder(@RequestParam Integer StatementId) {
-        List<Map<String, Object>> mapValue = bmstrainDetailsOrderService.getPurchaseTrainDetailsOrder(StatementId);
-        return mapValue;
+        List<Map<String, Object>> mapList = bmstrainDetailsOrderService.getPurchaseTrainDetailsOrder(StatementId);
+        return mapList;
     }
 
 

src/main/java/com/steerinfo/dil/mapper/RmsMaterialTypeMapper.java

@@ -3,6 +3,7 @@ package com.steerinfo.dil.mapper;
 import com.steerinfo.dil.model.RmsMaterialType;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -13,4 +14,7 @@ public interface RmsMaterialTypeMapper extends IBaseMapper<RmsMaterialType, BigD
 
     @Override
     List<RmsMaterialType> selectByParameters(Map<String, Object> parameters);
+
+//    @Select("select seq__RMS_MATERIAL.nextval from dual")
+//    BigDecimal getMaterialId();
 }

src/main/java/com/steerinfo/dil/model/RmsMaterialType.java

@@ -37,7 +37,7 @@ public class RmsMaterialType implements IBasePO<BigDecimal> {
      * 包装类型(MATERIAL_PACKING_TYPE,VARCHAR,20)
      */
     @ApiModelProperty(value="包装类型",required=false)
-    private String materialPackingType;
+    private BigDecimal materialTypeStatus;
 
     /**
      * 记录创建人(INSERT_USERNAME,VARCHAR,20)
@@ -113,12 +113,12 @@ public class RmsMaterialType implements IBasePO<BigDecimal> {
         this.materialOrder = materialOrder;
     }
 
-    public String getMaterialPackingType() {
-        return materialPackingType;
+    public BigDecimal getmaterialTypeStatus() {
+        return materialTypeStatus;
     }
 
-    public void setMaterialPackingType(String materialPackingType) {
-        this.materialPackingType = materialPackingType == null ? null : materialPackingType.trim();
+    public void setmaterialTypeStatus(BigDecimal materialTypeStatus) {
+        this.materialTypeStatus = materialTypeStatus;
     }
 
     public String getInsertUsername() {
@@ -171,7 +171,7 @@ public class RmsMaterialType implements IBasePO<BigDecimal> {
         sb.append(", materialTypeName=").append(materialTypeName);
         sb.append(", materialUnit=").append(materialUnit);
         sb.append(", materialOrder=").append(materialOrder);
-        sb.append(", materialPackingType=").append(materialPackingType);
+        sb.append(", materialTypeStatus=").append(materialTypeStatus);
         sb.append(", insertUsername=").append(insertUsername);
         sb.append(", insertTime=").append(insertTime);
         sb.append(", updateUsername=").append(updateUsername);

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

@@ -6,6 +6,7 @@ import com.steerinfo.dil.service.IRmsConsigneeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -62,6 +63,11 @@ public class RmsConsigneeServiceImpl implements IRmsConsigneeService {
         rmsConsignee.setConsigneeRegisteredAddress(consigneeRegisteredAddress);
         rmsConsignee.setConsigneeContactName(consigneeContactName);
         rmsConsignee.setConsigneeContactTel(consigneeContactTel);
+        rmsConsignee.setInsertTime(new Date());
+        rmsConsignee.setInsertUsername("admin");
+        rmsConsignee.setUpdateTime(new Date());
+        rmsConsignee.setUpdateUsername("admin");
+        rmsConsignee.setInsertUpdateRemark("无");
         int result = 0;
         List<RmsConsignee> rmsRmsConsignees = rmsConsigneeMapper.selectByParameters(map);
         // 新增

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

@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -50,7 +51,7 @@ public class RmsMaterialServiceImpl implements IRmsMaterialService {
         // 得到物资唯一编码
         String materialCode = (String) mapVal.get("materialCode");
         // 得到物资类型
-        String materialType = (String) mapVal.get("materialType");
+        String materialTypeName = (String) mapVal.get("materialType");
         // 得到物资名称
         String materialName = (String) mapVal.get("materialName");
         // 得到物资规格
@@ -61,7 +62,10 @@ public class RmsMaterialServiceImpl implements IRmsMaterialService {
         String unitOfMeasure = (String) mapVal.get("unitOfMeasure");
         // 得到长度
         String materialLengthValue = (String) mapVal.get("materialLength");
-        BigDecimal materialLength = new BigDecimal(materialLengthValue);
+        BigDecimal materialLength = null;
+        if (materialLengthValue != null) {
+            materialLength = new BigDecimal(materialLengthValue);;
+        }
         // 得到数据状态
         Integer dataStatus = (Integer) mapVal.get("dataStatus");
         // 判断是否EASId已存在
@@ -72,7 +76,7 @@ public class RmsMaterialServiceImpl implements IRmsMaterialService {
         List<RmsMaterial> rmsMaterials = rmsMaterialMapper.selectByParameters(map1);
         // 判断物资类型是否已存在
         Map<String,Object> map2 = new HashMap<>();
-        map2.put("materialType",materialType);
+        map2.put("materialTypeName",materialTypeName);
         List<RmsMaterialType> rmsMaterialTypes = rmsMaterialTypeMapper.selectByParameters(map2);
         RmsMaterialType rmsMaterialType = rmsMaterialTypes.get(0);
         // 判断单位是否已存在
@@ -89,6 +93,11 @@ public class RmsMaterialServiceImpl implements IRmsMaterialService {
         rmsMaterial.setEasMaterialId(EASMaterialId);
         rmsMaterial.setMaterialTypeId(rmsMaterialType.getMaterialTypeId());
         rmsMaterial.setUnitOfMeasureId(rmsUnitOfMeasure.getUnitOfMeasureId());
+        rmsMaterial.setInsertTime(new Date());
+        rmsMaterial.setInsertUsername("admin");
+        rmsMaterial.setUpdateTime(new Date());
+        rmsMaterial.setUpdateUsername("admin");
+        rmsMaterial.setInsertUpdateRemark("无");
         int result = 0;
         // 新增
         if (rmsMaterials.size() == 0) {

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

@@ -7,6 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -67,6 +68,11 @@ public class RmsSupplierServiceImpl implements IRmsSupplierService {
         rmsSupplier.setSupplierAddress(supplierAddress);
         rmsSupplier.setSupplierContactsName(supplierContactsName);
         rmsSupplier.setSupplierContactNumber(supplierContactNumber);
+        rmsSupplier.setInsertTime(new Date());
+        rmsSupplier.setInsertUsername("admin");
+        rmsSupplier.setUpdateTime(new Date());
+        rmsSupplier.setUpdateUsername("admin");
+        rmsSupplier.setInsertUpdateRemark("无");
         int result = 0;
         // 新增
         if (rmsSuppliers.size() == 0) {

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

@@ -6,7 +6,7 @@
     <result column="MATERIAL_TYPE_NAME" jdbcType="VARCHAR" property="materialTypeName" />
     <result column="MATERIAL_UNIT" jdbcType="VARCHAR" property="materialUnit" />
     <result column="MATERIAL_ORDER" jdbcType="DECIMAL" property="materialOrder" />
-    <result column="MATERIAL_PACKING_TYPE" jdbcType="VARCHAR" property="materialPackingType" />
+    <result column="MATERIAL_TYPE_STATUS" jdbcType="DECIMAL" property="materialTypeStatus" />
     <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
     <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
     <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
@@ -14,11 +14,11 @@
     <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
   </resultMap>
   <sql id="columns">
-    MATERIAL_TYPE_ID, MATERIAL_TYPE_NAME, MATERIAL_UNIT, MATERIAL_ORDER, MATERIAL_PACKING_TYPE, 
+    MATERIAL_TYPE_ID, MATERIAL_TYPE_NAME, MATERIAL_UNIT, MATERIAL_ORDER, MATERIAL_TYPE_STATUS, 
     INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK
   </sql>
   <sql id="columns_alias">
-    t.MATERIAL_TYPE_ID, t.MATERIAL_TYPE_NAME, t.MATERIAL_UNIT, t.MATERIAL_ORDER, t.MATERIAL_PACKING_TYPE, 
+    t.MATERIAL_TYPE_ID, t.MATERIAL_TYPE_NAME, t.MATERIAL_UNIT, t.MATERIAL_ORDER, t.MATERIAL_TYPE_STATUS, 
     t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK
   </sql>
   <sql id="select">
@@ -41,8 +41,8 @@
       <if test="materialOrder != null">
         and MATERIAL_ORDER = #{materialOrder}
       </if>
-      <if test="materialPackingType != null and materialPackingType != ''">
-        and MATERIAL_PACKING_TYPE = #{materialPackingType}
+      <if test="materialTypeStatus != null and materialTypeStatus != ''">
+        and MATERIAL_TYPE_STATUS = #{materialTypeStatus}
       </if>
       <if test="insertUsername != null and insertUsername != ''">
         and INSERT_USERNAME = #{insertUsername}
@@ -75,8 +75,8 @@
       <if test="materialOrder != null">
         and MATERIAL_ORDER = #{materialOrder}
       </if>
-      <if test="materialPackingType != null and materialPackingType != ''">
-        and MATERIAL_PACKING_TYPE LIKE '%${materialPackingType}%'
+      <if test="materialTypeStatus != null and materialTypeStatus != ''">
+        and MATERIAL_TYPE_STATUS LIKE '%${materialTypeStatus}%'
       </if>
       <if test="insertUsername != null and insertUsername != ''">
         and INSERT_USERNAME LIKE '%${insertUsername}%'
@@ -111,8 +111,8 @@
       <if test="materialOrder != null">
         or MATERIAL_ORDER = #{materialOrder}
       </if>
-      <if test="materialPackingType != null and materialPackingType != ''">
-        or MATERIAL_PACKING_TYPE = #{materialPackingType}
+      <if test="materialTypeStatus != null and materialTypeStatus != ''">
+        or MATERIAL_TYPE_STATUS = #{materialTypeStatus}
       </if>
       <if test="insertUsername != null and insertUsername != ''">
         or INSERT_USERNAME = #{insertUsername}
@@ -132,11 +132,11 @@
   </delete>
   <insert id="insert" parameterType="com.steerinfo.dil.model.RmsMaterialType">
     insert into RMS_MATERIAL_TYPE (MATERIAL_TYPE_ID, MATERIAL_TYPE_NAME, 
-      MATERIAL_UNIT, MATERIAL_ORDER, MATERIAL_PACKING_TYPE, 
+      MATERIAL_UNIT, MATERIAL_ORDER, MATERIAL_TYPE_STATUS, 
       INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
       UPDATE_TIME, INSERT_UPDATE_REMARK)
     values (#{materialTypeId,jdbcType=DECIMAL}, #{materialTypeName,jdbcType=VARCHAR}, 
-      #{materialUnit,jdbcType=VARCHAR}, #{materialOrder,jdbcType=DECIMAL}, #{materialPackingType,jdbcType=VARCHAR}, 
+      #{materialUnit,jdbcType=VARCHAR}, #{materialOrder,jdbcType=DECIMAL}, #{materialTypeStatus,jdbcType=DECIMAL},
       #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, 
       #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR})
   </insert>
@@ -155,8 +155,8 @@
       <if test="materialOrder != null">
         MATERIAL_ORDER,
       </if>
-      <if test="materialPackingType != null">
-        MATERIAL_PACKING_TYPE,
+      <if test="materialTypeStatus != null">
+        MATERIAL_TYPE_STATUS,
       </if>
       <if test="insertUsername != null">
         INSERT_USERNAME,
@@ -187,8 +187,8 @@
       <if test="materialOrder != null">
         #{materialOrder,jdbcType=DECIMAL},
       </if>
-      <if test="materialPackingType != null">
-        #{materialPackingType,jdbcType=VARCHAR},
+      <if test="materialTypeStatus != null">
+        #{materialTypeStatus,jdbcType=DECIMAL},
       </if>
       <if test="insertUsername != null">
         #{insertUsername,jdbcType=VARCHAR},
@@ -212,7 +212,7 @@
     set MATERIAL_TYPE_NAME = #{materialTypeName,jdbcType=VARCHAR},
       MATERIAL_UNIT = #{materialUnit,jdbcType=VARCHAR},
       MATERIAL_ORDER = #{materialOrder,jdbcType=DECIMAL},
-      MATERIAL_PACKING_TYPE = #{materialPackingType,jdbcType=VARCHAR},
+      MATERIAL_TYPE_STATUS = #{materialTypeStatus,jdbcType=DECIMAL},
       INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
       INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
       UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
@@ -232,8 +232,8 @@
       <if test="materialOrder != null">
         MATERIAL_ORDER = #{materialOrder,jdbcType=DECIMAL},
       </if>
-      <if test="materialPackingType != null">
-        MATERIAL_PACKING_TYPE = #{materialPackingType,jdbcType=VARCHAR},
+      <if test="materialTypeStatus != null">
+        MATERIAL_TYPE_STATUS = #{materialTypeStatus,jdbcType=DECIMAL},
       </if>
       <if test="insertUsername != null">
         INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
@@ -269,7 +269,7 @@
     insert into RMS_MATERIAL_TYPE 
       (MATERIAL_TYPE_ID, 
       MATERIAL_TYPE_NAME, MATERIAL_UNIT, 
-      MATERIAL_ORDER, MATERIAL_PACKING_TYPE, 
+      MATERIAL_ORDER, MATERIAL_TYPE_STATUS, 
       INSERT_USERNAME, INSERT_TIME, 
       UPDATE_USERNAME, UPDATE_TIME, 
       INSERT_UPDATE_REMARK)
@@ -277,7 +277,7 @@
    select  
       #{item.materialTypeId,jdbcType=DECIMAL}, 
       #{item.materialTypeName,jdbcType=VARCHAR}, #{item.materialUnit,jdbcType=VARCHAR}, 
-      #{item.materialOrder,jdbcType=DECIMAL}, #{item.materialPackingType,jdbcType=VARCHAR}, 
+      #{item.materialOrder,jdbcType=DECIMAL}, #{item.materialTypeStatus,jdbcType=DECIMAL},
       #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP}, 
       #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
       #{item.insertUpdateRemark,jdbcType=VARCHAR} from dual  
@@ -302,9 +302,9 @@
        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_TYPE_ID" separator=" ">
           when #{item.materialTypeId,jdbcType=DECIMAL} then #{item.materialOrder,jdbcType=DECIMAL}
        </foreach>
-       ,MATERIAL_PACKING_TYPE=
+       ,MATERIAL_TYPE_STATUS=
        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_TYPE_ID" separator=" ">
-          when #{item.materialTypeId,jdbcType=DECIMAL} then #{item.materialPackingType,jdbcType=VARCHAR}
+          when #{item.materialTypeId,jdbcType=DECIMAL} then #{item.materialTypeStatus,jdbcType=DECIMAL}
        </foreach>
        ,INSERT_USERNAME=
        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_TYPE_ID" separator=" ">