pom.xml

@@ -550,6 +550,16 @@
 
     <build>
         <finalName>thware_zg</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
+        </plugins>
         <resources>
             <resource>
                 <directory>src/main/resource</directory>

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

@@ -89,6 +89,10 @@ public class OutRecord {
     private String contractNo;
     private String packNo;
 
+    // 出库记录增加价格计算时间的信息
+    private String payWay;
+
+
     public Double getStoreFee() {
         return storeFee;
     }
@@ -447,4 +451,12 @@ public class OutRecord {
     public void setPackNo(String packNo) {
         this.packNo = packNo;
     }
+
+    public String getPayWay() {
+        return payWay;
+    }
+
+    public void setPayWay(String payWay) {
+        this.payWay = payWay;
+    }
 }

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

@@ -25,6 +25,8 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
 
+import static java.lang.Math.toIntExact;
+
 @Service("OutService")
 public class OutServiceImpl implements OutService {
 
@@ -48,6 +50,8 @@ public class OutServiceImpl implements OutService {
     public ChangeRecordMapper changeRecordMapper;
     @Autowired
     public PriceMapper priceMapper;
+    @Autowired
+    public InRecordMapper inRecordMapper;
 
     String result = Type.FAIL;
     int num = 0;
@@ -149,8 +153,6 @@ public class OutServiceImpl implements OutService {
             List<StoreOfWareStack> listSows = storeMapper.selectWareStackByDistributionStore(map);
 
             for (int m = 0; m < listSows.size(); m++) {
-
-
                 Stack stack = stackMapper.selectByPrimaryKey(listSows.get(m).getStackId());
                 Map<String, Object> mapParam = new HashMap<String, Object>();
                 mapParam.put("storeId", listStoreId);
@@ -300,6 +302,39 @@ public class OutServiceImpl implements OutService {
         outRecord.setEdgeTy(store.getEdgeTy());
         outRecord.setProductionPlace(store.getProductionPlace());
         outRecord.setInvoicePrice(store.getInvoicePrice());
+
+        // 增加天数计算，以及计算价格
+        if (!recordType.equals("0")) {
+            InRecord inRecord = inRecordMapper.selectByPrimaryKey(store.getInId());
+            Date InDate = inRecord.getAddTime();
+            Date OutDate = new Date();
+            long diffMillis = OutDate.getTime() - InDate.getTime();
+            long millisPerDay = 24 * 60 * 60 * 1000;
+
+            // 计算天数并向上取整
+            Long days_L = diffMillis / millisPerDay;
+            if (diffMillis % millisPerDay > 0) {
+                days_L++;
+            }
+            int days = toIntExact(days_L);
+            outRecord.setInWareDays(days);
+
+            List<Price> priceList = priceMapper.selectListByCustomer(store.getFkComponyId(), store.getBelongId(),store.getMaterial().getCode());
+            if (priceList.size() ==1){
+                Price price = priceList.get(0);
+                if (price.getKeepDay() >= days){
+                    outRecord.setInvoicePrice(price.getOrdPrice()* store.getWeight());
+
+                }else {
+                    Double invoicePrice = price.getOrdPrice()* store.getWeight();
+                    invoicePrice = invoicePrice + ((days-price.getKeepDay())*price.getOutOrdPrice()* store.getWeight());
+                    outRecord.setInvoicePrice(invoicePrice);
+                }
+                outRecord.setPayWay(price.getPayWay());
+            }
+
+
+        }
         return outRecord;
     }
 

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

@@ -354,7 +354,10 @@
             and  a.user_id = #{param10,jdbcType=VARCHAR}  )
             )  or t.customer_name like CONCAT((select attr3 from sys_user temp where temp.id=#{param10,jdbcType=VARCHAR}),'%') )
     and ifnull(t.tally_people,'*') like concat('%',#{param14,jdbcType=VARCHAR},'%')
-    and ifnull(a.name,'*') like concat('%',#{param15,jdbcType=VARCHAR},'%')
+    <if test="param15 != null and param15 != ''">
+      and ifnull(a.name,'*') = #{param15,jdbcType=VARCHAR}
+    </if>
+
 
     and  (t.plate_no like concat('%',#{param7,jdbcType=VARCHAR},'%')
     <if test="param18 != null and param18.size() !=0" >
@@ -405,7 +408,9 @@
             and  a.user_id = #{param10,jdbcType=VARCHAR}  )
             )  or t.customer_name like CONCAT((select attr3 from sys_user temp where temp.id=#{param10,jdbcType=VARCHAR}),'%') )
     and ifnull(t.tally_people,'*') like concat('%',#{param14,jdbcType=VARCHAR},'%')
-    and ifnull(a.name,'*') like concat('%',#{param15,jdbcType=VARCHAR},'%')
+    <if test="param15 != null and param15 != ''">
+      and ifnull(a.name,'*') = #{param15,jdbcType=VARCHAR}
+    </if>
     and  (t.plate_no like concat('%',#{param7,jdbcType=VARCHAR},'%')
     <if test="param18 != null and param18.size() !=0" >
       or t.plate_no IN <foreach  item="item" collection="param18" index="index"  open="(" separator="," close=")">

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

@@ -37,6 +37,7 @@
     <result column="in_car_no" property="inCarNo" jdbcType="VARCHAR" />
     <result column="out_car_no" property="outCarNo" jdbcType="VARCHAR" />
     <result column="fk_compony_name" property="fkComponyName" jdbcType="VARCHAR" />
+    <result column="pay_way" property="payWay" jdbcType="VARCHAR" />
     <result column="invoice_price" property="invoicePrice" jdbcType="DOUBLE" />
     <result column="verify_account_id" property="verifyAccountId" jdbcType="DOUBLE" />
 
@@ -93,6 +94,7 @@
     <result column="store_fee" property="storeFee" jdbcType="DOUBLE" />
     <result column="pack_no" property="packNo" jdbcType="VARCHAR" />
     <result column="contract_no" property="contractNo" jdbcType="VARCHAR" />
+    <result column="pay_way" property="payWay" jdbcType="VARCHAR" />
   </resultMap>
   <resultMap id="TotalResultMap" type="com.th.demo.model.ware.TotalRecord">
     <result column="total_amount" property="totalAmount" jdbcType="DOUBLE" />
@@ -105,7 +107,7 @@
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
-    <include refid="Base_Column_List" />
+    *
     from t_ware_out_record
     where id = #{id,jdbcType=VARCHAR}
   </select>
@@ -125,7 +127,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,pack_no,contract_no,ord_no,fk_compony_name)
+    ,wgt_dcn_mtc_cd,edge_ty,production_place,tally_people,invoice_price,pack_no,contract_no,ord_no,fk_compony_name,in_ware_days,pay_way)
     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}, 
@@ -136,7 +138,7 @@
     #{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},
-    #{packNo,jdbcType=VARCHAR},#{contractNo,jdbcType=VARCHAR},#{ordNo,jdbcType=VARCHAR},#{fkComponyName,jdbcType=VARCHAR})
+    #{packNo,jdbcType=VARCHAR},#{contractNo,jdbcType=VARCHAR},#{ordNo,jdbcType=VARCHAR},#{fkComponyName,jdbcType=VARCHAR},#{inWareDays,jdbcType=DOUBLE},#{payWay,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.th.demo.model.ware.OutRecord" >
     insert into t_ware_out_record
@@ -423,7 +425,9 @@
             )  or t.customer_name like CONCAT((select attr3 from sys_user temp where temp.id=#{param10,jdbcType=VARCHAR}),'%') )
    and ifnull(p.tally_people,'*') like concat('%',#{param13,jdbcType=VARCHAR},'%')
    and ifnull(c.ord_no,'*') like concat('%',#{param14,jdbcType=VARCHAR},'%')
-   and ifnull(e.name,'*') like concat('%',#{param15,jdbcType=VARCHAR},'%')
+    <if test="param15 != null and param15 != ''">
+      and ifnull(e.name,'*') = #{param15,jdbcType=VARCHAR}
+    </if>
     and ifnull(t.back_flag,0) &lt;> '1'
     order by t.add_time desc
   </select>
@@ -450,7 +454,9 @@
             and  a.user_id = #{param10,jdbcType=VARCHAR}  )
             )  or t.customer_name like CONCAT((select attr3 from sys_user temp where temp.id=#{param10,jdbcType=VARCHAR}),'%') )
     and ifnull(p.tally_people,'*') like concat('%',#{param13,jdbcType=VARCHAR},'%')
-    and ifnull(e.name,'*') like concat('%',#{param15,jdbcType=VARCHAR},'%')
+    <if test="param15 != null and param15 != ''">
+      and ifnull(e.name,'*') = #{param15,jdbcType=VARCHAR}
+    </if>
     and ifnull(t.back_flag,0) &lt;> '1'
     and  (t.plate_no like concat('%',#{param7,jdbcType=VARCHAR},'%')
     <if test="param18 != null and param18.size() !=0" >

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

@@ -495,8 +495,12 @@ update t_ware_store t set t.layer =   #{param7,jdbcType=INTEGER}
     and  t.model like concat('%',#{param3,jdbcType=VARCHAR},'%')
     and  c.name like concat('%',#{param4,jdbcType=VARCHAR},'%')
     and  c.standard like concat('%',#{param5,jdbcType=VARCHAR},'%')
-    and  d.name like concat('%',#{param6,jdbcType=VARCHAR},'%')
-    and  e.name like concat('%',#{param9,jdbcType=VARCHAR},'%')
+    <if test="param6 != null and param6 != ''">
+      and ifnull(d.name,'*') = #{param6,jdbcType=VARCHAR}
+    </if>
+    <if test="param9 != null and param9 != ''">
+      and ifnull(e.name,'*') = #{param9,jdbcType=VARCHAR}
+    </if>
 
       and  (t.plate_no like concat('%',#{param10,jdbcType=VARCHAR},'%')
     <if test="param13 != null and param13.size() !=0" >
@@ -556,8 +560,12 @@ update t_ware_store t set t.layer =   #{param7,jdbcType=INTEGER}
     and  t.model like concat('%',#{param3,jdbcType=VARCHAR},'%')
     and  c.name like concat('%',#{param4,jdbcType=VARCHAR},'%')
     and  c.standard like concat('%',#{param5,jdbcType=VARCHAR},'%')
-    and  d.name like concat('%',#{param6,jdbcType=VARCHAR},'%')
-    and  e.name like concat('%',#{param9,jdbcType=VARCHAR},'%')
+    <if test="param6 != null and param6 != ''">
+      and ifnull(d.name,'*') = #{param6,jdbcType=VARCHAR}
+    </if>
+    <if test="param9 != null and param9 != ''">
+      and ifnull(e.name,'*') = #{param9,jdbcType=VARCHAR}
+    </if>
 
     and  (t.plate_no like concat('%',#{param10,jdbcType=VARCHAR},'%')
     <if test="param13 != null and param13.size() !=0" >
@@ -673,7 +681,12 @@ update t_ware_store t set t.layer =   #{param7,jdbcType=INTEGER}
     and  t.model like concat('%',#{param3,jdbcType=VARCHAR},'%')
     and  c.name like concat('%',#{param4,jdbcType=VARCHAR},'%')
     and  c.standard like concat('%',#{param5,jdbcType=VARCHAR},'%')
-    and  d.name like concat('%',#{param6,jdbcType=VARCHAR},'%')
+    <if test="param6 != null and param6 != ''">
+      and ifnull(d.name,'*') = #{param6,jdbcType=VARCHAR}
+    </if>
+    <if test="param9 != null and param9 != ''">
+      and ifnull(e.name,'*') = #{param9,jdbcType=VARCHAR}
+    </if>
     and  t.plate_no like concat('%',#{param7,jdbcType=VARCHAR},'%')
     and t.cancel_flag = '0'
     and t.out_flag = '0'