部分细节调整第一版

src/main/java/com/th/demo/mapping/maint/PriceMapper.java

@@ -19,7 +19,7 @@ public interface PriceMapper {
 
     int updateByPrimaryKey(Price record);
 
-    Price selectByMaterialChangeTime(String id, int changeTime,String belongId);
+    Price selectByMaterialChangeTime(String id, String belongId);
 
     List<Price> select(String customerName,  String belongId);
 

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

@@ -61,6 +61,15 @@ public class InRecord {
     private String tallyPeople;
 
     private String fkComponyName;
+    private double invoicePrice;
+
+    public double getInvoicePrice() {
+        return invoicePrice;
+    }
+
+    public void setInvoicePrice(double invoicePrice) {
+        this.invoicePrice = invoicePrice;
+    }
 
     public String getFkComponyName() {
         return fkComponyName;

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

@@ -85,6 +85,15 @@ public class OutRecord {
 
     private Double storeFee;
     private Integer inWareDays;
+    private Double unitPrice;
+
+    public Double getUnitPrice() {
+        return unitPrice;
+    }
+
+    public void setUnitPrice(Double unitPrice) {
+        this.unitPrice = unitPrice;
+    }
 
     public Double getStoreFee() {
         return storeFee;

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

@@ -74,6 +74,15 @@ public class Store  implements Comparable<Store>{
     private String fkComponyId ;
 
     private Double invoicePrice;
+    private String contractNo;
+
+    public String getContractNo() {
+        return contractNo;
+    }
+
+    public void setContractNo(String contractNo) {
+        this.contractNo = contractNo;
+    }
 
     public Double getInvoicePrice() {
         return invoicePrice;

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

@@ -45,6 +45,8 @@ public class InServiceImpl implements InService {
     public MaterialMapper materialMapper;
     @Autowired
     public ProdPriceMapper prodPriceMapper;
+    @Autowired
+    public PriceMapper priceMapper;
     String result = Type.FAIL;
     int num = 0;
 
@@ -216,7 +218,7 @@ public class InServiceImpl implements InService {
         } else {
             currentLayer = -1;
         }
-        ProdPrice prodPrice = new ProdPrice();
+        Price Price = new Price();
         for (int m = 0; m < listSameStack.size(); m++) {
 
             if (stack.getIsLayer().equals("1")) {
@@ -228,11 +230,12 @@ public class InServiceImpl implements InService {
             listSameStack.get(m).setAddTime(new Date());
             listSameStack.get(m).setCancelFlag("0");
             listSameStack.get(m).setBelongId(belongId);
-            /*prodPrice = prodPriceMapper.selectByProdNm(listSameStack.get(m).getMaterial().getName());
-            if(prodPrice == null){
-                throw new Exception(listSameStack.get(m).getMaterial().getName()+"价格未维护");
+            Price = priceMapper.selectByMaterialChangeTime(listSameStack.get(m).getFkComponyId().toString(),belongId);
+            if(Price == null){
+                Customer fk_compony = customerMapper.selectByPrimaryKey(listSameStack.get(m).getFkComponyId());
+                throw new Exception(fk_compony.getName()+"公司的价格未维护");
             }
-            listSameStack.get(m).setInvoicePrice(prodPrice.getInvoicePrice());*/
+            listSameStack.get(m).setInvoicePrice(Price.getOrdPrice());
             InRecord inRecord = getInRecord(listSameStack.get(m), "1", userId);
             num += inRecordMapper.insert(inRecord);
 
@@ -250,10 +253,10 @@ public class InServiceImpl implements InService {
         List<Store> listStore = new ArrayList<>();
         String wareName = listJO.get(0).get("仓库名称").toString();
         String stackName = listJO.get(0).get("垛位号").toString();
-        String materialName = listJO.get(0).get("物料类型").toString();
-        String standard = listJO.get(0).get("钢种").toString();
+        String materialName = listJO.get(0).get("货物品名").toString();
+        String standard = listJO.get(0).get("材质").toString();
         String customerName = listJO.get(0).get("客户名称").toString();
-        String fk_compony_name = listJO.get(0).get("货权单位").toString();
+        String fk_compony_name = listJO.get(0).get("客户名称").toString();
         Ware ware = wareMapper.selectByWareName(wareName, userId, belongId);
         if (ware == null) {
             err += "未找到名为\"" + wareName + "\"的库房；";
@@ -303,33 +306,33 @@ public class InServiceImpl implements InService {
                 }
                 store.setStack(stack);
             }
-            if (listJO.get(i).get("物料类型").toString().equals(materialName) && listJO.get(i).get("钢种").toString().equals(standard)) {
+            if (listJO.get(i).get("货物品名").toString().equals(materialName) && listJO.get(i).get("材质").toString().equals(standard)) {
                 store.setMaterial(material);
             } else {
-                materialName = listJO.get(i).get("物料类型").toString();
-                standard = listJO.get(i).get("钢种").toString();
+                materialName = listJO.get(i).get("货物品名").toString();
+                standard = listJO.get(i).get("材质").toString();
                 material = materialMapper.selectByNameStandard(materialName, standard, belongId);
                 if (material == null) {
-                    err += "未找到名为\"" + materialName + "，" + standard + "\"的物料类型；";
+                    err += "未找到名为\"" + materialName + "，" + standard + "\"的货物品名；";
                     throw new Exception(err);
                 }
                 store.setMaterial(material);
             }
-            if (listJO.get(i).get("客户名称").toString().equals(customerName)) {
+            if (listJO.get(i).get("订单客户").toString().equals(customerName)) {
                 store.setCustomer(customer);
             } else {
-                customerName = listJO.get(i).get("客户名称").toString();
+                customerName = listJO.get(i).get("订单客户").toString();
                 customer = customerMapper.selectByName(customerName, belongId);
                 if (customer == null) {
-                    err += "未找到名为\"" + customerName + "\"的客户名称；";
+                    err += "未找到名为\"" + customerName + "\"的订单客户名称；";
                     throw new Exception(err);
                 }
                 store.setCustomer(customer);
             }
-            if (listJO.get(i).get("货权单位").toString().equals(fk_compony_name)) {
+            if (listJO.get(i).get("客户名称").toString().equals(fk_compony_name)) {
                 store.setFkComponyId(fk_compony.getId());
             } else {
-                fk_compony_name = listJO.get(i).get("货权单位").toString();
+                fk_compony_name = listJO.get(i).get("客户名称").toString();
                 fk_compony = customerMapper.selectByName(fk_compony_name, belongId);
                 if (customer == null) {
                     err += "未找到名为\"" + customerName + "\"的客户名称；";
@@ -338,14 +341,14 @@ public class InServiceImpl implements InService {
                 store.setFkComponyId(fk_compony.getId());
             }
             store.setLayer(Integer.parseInt(listJO.get(i).get("层号").toString()));
-            store.setPlateNo(listJO.get(i).get("产品编号").toString());
-            store.setModel(listJO.get(i).get("产品规格").toString());
+            store.setPlateNo(listJO.get(i).get("顺序号").toString());
+            store.setModel(listJO.get(i).get("规格").toString());
             store.setCount(Double.parseDouble(listJO.get(i).get("数量").toString()));
             store.setWeight(Double.parseDouble(listJO.get(i).get("重量").toString()));
-            if (listJO.get(i).get("收货地址") == null || listJO.get(i).get("收货地址").toString().equals("")) {
+            if (listJO.get(i).get("目的地") == null || listJO.get(i).get("目的地").toString().equals("")) {
                 store.setReceiveAddress(customer.getAddress());
             } else {
-                store.setReceiveAddress(listJO.get(i).get("收货地址").toString());
+                store.setReceiveAddress(listJO.get(i).get("目的地").toString());
             }
             if(listJO.get(i).get("备注") != null){
                 store.setRemark(listJO.get(i).get("备注").toString());
@@ -356,12 +359,6 @@ public class InServiceImpl implements InService {
             store.setCancelFlag("0");
             store.setOutFlag("0");
             store.setBelongId(belongId);
-            if(listJO.get(i).get("计量方式") != null){
-                store.setWgtDcnMtcCd(listJO.get(i).get("计量方式").toString());
-            }
-            if(listJO.get(i).get("切边类型") != null){
-                store.setEdgeTy(listJO.get(i).get("切边类型").toString());
-            }
             if(listJO.get(i).get("产地") != null){
                 store.setProductionPlace(listJO.get(i).get("产地").toString());
             }
@@ -369,11 +366,14 @@ public class InServiceImpl implements InService {
             if(listJO.get(i).get("订单号") != null){
                 store.setOrdNo(listJO.get(i).get("订单号").toString());
             }
+            if(listJO.get(i).get("合约号") != null){
+                store.setContractNo(listJO.get(i).get("合约号").toString());
+            }
             if(listJO.get(i).get("车号") != null){
                 store.setCarNo(listJO.get(i).get("车号").toString());
             }
-            if(listJO.get(i).get("入库理货人员") != null){
-                store.setTallyPeople(listJO.get(i).get("入库理货人员").toString());
+            if(listJO.get(i).get("吊装工") != null){
+                store.setTallyPeople(listJO.get(i).get("吊装工").toString());
             }
             listStore.add(store);
         }

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

@@ -47,6 +47,8 @@ public class OutServiceImpl implements OutService {
     public ChangeRecordMapper changeRecordMapper;
     @Autowired
     public PriceMapper priceMapper;
+    @Autowired
+    public InRecordMapper inRecordMapper;
 
     String result = Type.FAIL;
     int num = 0;
@@ -298,7 +300,19 @@ public class OutServiceImpl implements OutService {
         outRecord.setWgtDcnMtcCd(store.getWgtDcnMtcCd());
         outRecord.setEdgeTy(store.getEdgeTy());
         outRecord.setProductionPlace(store.getProductionPlace());
-        outRecord.setInvoicePrice(store.getInvoicePrice());
+        InRecord inRecord = inRecordMapper.selectByPrimaryKey(store.getInId());
+        double asd = (outRecord.getAddTime().getDate() - inRecord.getAddTime().getTime())/ (24 * 60 * 60 * 1000);
+        Price price = priceMapper.selectByMaterialChangeTime(store.getFkComponyId(),store.getBelongId());
+        if (asd > price.getKeepDay()){
+            outRecord.setInvoicePrice(price.getOutOrdPrice());
+            outRecord.setUnitPrice(price.getOutOrdPrice());
+        }else {
+            outRecord.setInvoicePrice(price.getOrdPrice());
+            outRecord.setUnitPrice(price.getOrdPrice());
+        }
+
+
+
         return outRecord;
     }
 

src/main/resource/mapper/maint/PriceMapper.xml

@@ -210,8 +210,7 @@ transfer_price,
 
   <select id="selectByMaterialChangeTime" resultMap="BaseResultMap" >
     select *   from t_maint_price
-    where 1=1 --material_id = #{param1,jdbcType=VARCHAR}
-      --and storage_type = #{param2,jdbcType=VARCHAR}
+    where 1=1
       and customer_id = #{param1,jdbcType=VARCHAR}
      and belong_id = #{param2,jdbcType=VARCHAR}
      and cancel_flag = '0'

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

@@ -39,6 +39,7 @@
     <result column="fk_compony_name" property="fkComponyName" jdbcType="VARCHAR" />
     <result column="invoice_price" property="invoicePrice" jdbcType="DOUBLE" />
     <result column="verify_account_id" property="verifyAccountId" jdbcType="DOUBLE" />
+    <result column="unit_price" property="unitPrice" jdbcType="DOUBLE" />
 
     <result column="in_ware_days" property="inWareDays" jdbcType="INTEGER" />
     <result column="store_fee" property="storeFee" jdbcType="DOUBLE" />
@@ -88,6 +89,7 @@
     <result column="distribution_id" property="distributionId" jdbcType="VARCHAR" />
     <result column="in_ware_days" property="inWareDays" jdbcType="INTEGER" />
     <result column="store_fee" property="storeFee" jdbcType="DOUBLE" />
+    <result column="unit_price" property="unitPrice" jdbcType="DOUBLE" />
   </resultMap>
   <resultMap id="TotalResultMap" type="com.th.demo.model.ware.TotalRecord">
     <result column="total_amount" property="totalAmount" jdbcType="DOUBLE" />
@@ -96,7 +98,7 @@
   <sql id="Base_Column_List" >
     id, ware_name, stack_name, layer, material_name, material_no, standard, model, customer_name, 
     customer_no, count, weight, remark, add_id, add_time, modify_id, modify_time, cancel_id, 
-    cancel_time, cancel_flag, belong_id, plate_no,in_id, record_type,back_flag,receive_address,distribution_id,wgt_dcn_mtc_cd,edge_ty,production_place,verify_account_id
+    cancel_time, cancel_flag, belong_id, plate_no,in_id, record_type,back_flag,receive_address,distribution_id,wgt_dcn_mtc_cd,edge_ty,production_place,verify_account_id,unit_price
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
@@ -120,7 +122,7 @@
       modify_id, modify_time, cancel_id, 
       cancel_time, cancel_flag, belong_id, 
       plate_no,in_id, record_type,back_flag,receive_address,distribution_id
-    ,wgt_dcn_mtc_cd,edge_ty,production_place,tally_people,invoice_price)
+    ,wgt_dcn_mtc_cd,edge_ty,production_place,tally_people,invoice_price,unit_price)
     values (#{id,jdbcType=VARCHAR}, #{wareName,jdbcType=VARCHAR}, #{stackName,jdbcType=VARCHAR}, 
       #{layer,jdbcType=INTEGER}, #{materialName,jdbcType=VARCHAR}, #{materialNo,jdbcType=VARCHAR}, 
       #{standard,jdbcType=VARCHAR}, #{model,jdbcType=VARCHAR}, #{customerName,jdbcType=VARCHAR}, 
@@ -130,7 +132,7 @@
       #{cancelTime,jdbcType=TIMESTAMP}, #{cancelFlag,jdbcType=VARCHAR}, #{belongId,jdbcType=VARCHAR},
     #{plateNo,jdbcType=VARCHAR},  #{inId,jdbcType=VARCHAR}, #{recordType,jdbcType=VARCHAR},
     #{backFlag,jdbcType=VARCHAR}, #{receiveAddress,jdbcType=VARCHAR}, #{distributionId,jdbcType=VARCHAR}
-    ,#{wgtDcnMtcCd,jdbcType=VARCHAR},#{edgeTy,jdbcType=VARCHAR},#{productionPlace,jdbcType=VARCHAR},#{tallyPeople,jdbcType=VARCHAR},#{invoicePrice,jdbcType=DOUBLE})
+    ,#{wgtDcnMtcCd,jdbcType=VARCHAR},#{edgeTy,jdbcType=VARCHAR},#{productionPlace,jdbcType=VARCHAR},#{tallyPeople,jdbcType=VARCHAR},#{invoicePrice,jdbcType=DOUBLE},#{unitPrice,jdbcType=DOUBLE})
   </insert>
   <insert id="insertSelective" parameterType="com.th.demo.model.ware.OutRecord" >
     insert into t_ware_out_record
@@ -367,7 +369,8 @@
            record_type = #{recordType,jdbcType=VARCHAR},
           back_flag =  #{backFlag,jdbcType=VARCHAR},
     receive_address = #{receiveAddress,jdbcType=VARCHAR},
-      distribution_id =  #{distributionId,jdbcType=VARCHAR}
+      distribution_id =  #{distributionId,jdbcType=VARCHAR},
+        unit_price =  #{unitPrice,jdbcType=DOUBLE}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 
@@ -379,7 +382,7 @@
 
   <update id="savePriceMod" parameterType="com.th.demo.model.ware.OutRecord" >
     update t_ware_out_record t
-    set t.invoice_price = #{invoicePrice,jdbcType=DOUBLE}
+    set t.unit_price = #{invoicePrice,jdbcType=DOUBLE}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   <update id="cleanVerifyInfo" parameterType="java.lang.String" >

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

@@ -32,6 +32,7 @@
     <result column="fk_compony_id" property="fkComponyId" jdbcType="VARCHAR" />
 
     <result column="invoice_price" property="invoicePrice" jdbcType="DOUBLE" />
+    <result column="contract_no" property="contractNo" jdbcType="VARCHAR" />
 
 
     <association  column="ware_id" property="ware" select="com.th.demo.mapping.maint.WareMapper.selectByPrimaryKey" />
@@ -56,7 +57,7 @@
   <sql id="Base_Column_List" >
     id, ware_id, stack_id, layer, material_id, model, plate_no, customer_id, count, weight,
     remark, add_id, add_time, modify_id, modify_time, cancel_id, cancel_time, cancel_flag,
-    belong_id, in_id, out_id, receive_address, out_flag, lock_flag,wgt_dcn_mtc_cd,edge_ty,production_place
+    belong_id, in_id, out_id, receive_address, out_flag, lock_flag,wgt_dcn_mtc_cd,edge_ty,production_place,contract_no
   </sql>
 
 
@@ -86,7 +87,7 @@
       belong_id, in_id, out_id,
       receive_address, out_flag, lock_flag
       ,wgt_dcn_mtc_cd,edge_ty,production_place,ord_no
-      ,car_no,tally_people,fk_compony_id,invoice_price
+      ,car_no,tally_people,fk_compony_id,invoice_price,contract_no
     )
     values (#{id,jdbcType=VARCHAR}, #{ware.id,jdbcType=VARCHAR}, #{stack.id,jdbcType=VARCHAR},
       #{layer,jdbcType=INTEGER}, #{material.id,jdbcType=VARCHAR}, #{model,jdbcType=VARCHAR},
@@ -97,7 +98,7 @@
       #{belongId,jdbcType=VARCHAR}, #{inId,jdbcType=VARCHAR}, #{outId,jdbcType=VARCHAR},
       #{receiveAddress,jdbcType=VARCHAR}, #{outFlag,jdbcType=VARCHAR}, #{lockFlag,jdbcType=VARCHAR}
       ,#{wgtDcnMtcCd,jdbcType=VARCHAR},#{edgeTy,jdbcType=VARCHAR},#{productionPlace,jdbcType=VARCHAR},#{ordNo,jdbcType=VARCHAR}
-     ,#{carNo,jdbcType=VARCHAR},#{tallyPeople,jdbcType=VARCHAR},#{fkComponyId,jdbcType=VARCHAR},#{invoicePrice,jdbcType=DOUBLE}
+     ,#{carNo,jdbcType=VARCHAR},#{tallyPeople,jdbcType=VARCHAR},#{fkComponyId,jdbcType=VARCHAR},#{invoicePrice,jdbcType=DOUBLE},#{contractNo,jdbcType=VARCHAR}
       )
   </insert>
 
@@ -324,7 +325,8 @@
       out_id = #{outId,jdbcType=VARCHAR},
       receive_address = #{receiveAddress,jdbcType=VARCHAR},
       out_flag = #{outFlag,jdbcType=VARCHAR},
-      lock_flag = #{lockFlag,jdbcType=VARCHAR}
+      lock_flag = #{lockFlag,jdbcType=VARCHAR},
+      contract_no = #{contractNo,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>