luobang %!s(int64=2) %!d(string=hai) anos
pai
achega
90b434910a

+ 5 - 0
src/main/java/com/steerinfo/dil/controller/AmsSaleOrderMaterialController.java

@@ -305,6 +305,11 @@ public class AmsSaleOrderMaterialController extends BaseRESTfulController {
             i += amsSaleOrderMaterialService.updateInwardConsignee(map);
         }
         return success(i);
+    }
 
+    @ApiOperation("批量修改火车发运的截止日期")
+    @PostMapping("/batchUpdateSaleDate")
+    public RESTfulResult batchUpdateSaleDate() {
+        return success(amsSaleOrderMaterialService.batchUpdateSaleDate());
     }
 }

+ 2 - 0
src/main/java/com/steerinfo/dil/mapper/AmsSaleOrderMapper.java

@@ -219,4 +219,6 @@ public interface AmsSaleOrderMapper extends IBaseMapper<AmsSaleOrder, BigDecimal
 
     Date getSaleOrderTime(BigDecimal saleOrderId);
 
+    List<BigDecimal> getSaleOrderIds();
+
 }

+ 3 - 0
src/main/java/com/steerinfo/dil/mapper/AmsSaleOrderMaterialMapper.java

@@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -96,4 +97,6 @@ public interface AmsSaleOrderMaterialMapper extends IBaseMapper<AmsSaleOrderMate
 
     int selectSaleOrdeNoIsUpload(String saleOrderNo);
 
+    void updateSaleOrderReceipt(BigDecimal saleOrderId, Date receiptDateByDate);
+
 }

+ 3 - 0
src/main/java/com/steerinfo/dil/service/IAmsSaleOrderMaterialService.java

@@ -77,4 +77,7 @@ public interface IAmsSaleOrderMaterialService{
     int splitOrder(Map<String, Object> map);
 
     BigDecimal getDeatailsOrder(BigDecimal closeWlEntryId);
+
+    Object batchUpdateSaleDate();
+
 }

+ 25 - 1
src/main/java/com/steerinfo/dil/service/impl/AmsSaleOrderMaterialServiceImpl.java

@@ -582,7 +582,7 @@ public class AmsSaleOrderMaterialServiceImpl implements IAmsSaleOrderMaterialSer
             calendar.setTime(saleOrderInsertTime);
             calendar.add(Calendar.DATE,1);
             SimpleDateFormat sdfDate = new SimpleDateFormat("yyyy-MM-dd");
-            String receiptDate = sdfDate.format(saleOrderInsertTime) + " 07:59:59";
+            String receiptDate = sdfDate.format(calendar.getTime()) + " 07:59:59";
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             amsSaleOrderMaterial.setSaleDateOfReceipt(sdf.parse(receiptDate));
         } catch (ParseException e) {
@@ -1233,4 +1233,28 @@ public class AmsSaleOrderMaterialServiceImpl implements IAmsSaleOrderMaterialSer
     public BigDecimal getDeatailsOrder(BigDecimal closeWlEntryId) {
         return amsSaleOrderMaterialMapper.getDeatailsOrder(closeWlEntryId);
     }
+
+    @Override
+    public Object batchUpdateSaleDate() {
+        //查询所有的销售订单车皮
+        List<BigDecimal> saleOrderIds = amsSaleOrderMapper.getSaleOrderIds();
+        for(BigDecimal saleOrderId :saleOrderIds) {
+            Date saleOrderInsertTime = amsSaleOrderMapper.getSaleOrderTime(saleOrderId);
+            Calendar calendar=Calendar.getInstance();
+            calendar.setTime(saleOrderInsertTime);
+            calendar.add(Calendar.DATE,1);
+            SimpleDateFormat sdfDate = new SimpleDateFormat("yyyy-MM-dd");
+            String receiptDate = sdfDate.format(calendar.getTime()) + " 07:59:59";
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            try {
+                Date receiptDateByDate = sdf.parse(receiptDate);
+                amsSaleOrderMaterialMapper.updateSaleOrderReceipt(saleOrderId,receiptDateByDate);
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+
+        }
+        System.out.println(saleOrderIds + ":saleOrderIds");
+        return null;
+    }
 }

+ 4 - 0
src/main/resources/com/steerinfo/dil/mapper/AmsSaleOrderMapper.xml

@@ -4963,5 +4963,9 @@
     SELECT INSERT_TIME FROM AMS_SALE_ORDER
     WHERE SALE_ORDER_ID = #{saleOrderId}
   </select>
+    <select id="getSaleOrderIds" resultType="java.math.BigDecimal">
+      SELECT SALE_ORDER_ID FROM AMS_SALE_ORDER
+      WHERE SALE_TYPE = 4
+    </select>
 
 </mapper>

+ 7 - 1
src/main/resources/com/steerinfo/dil/mapper/AmsSaleOrderMaterialMapper.xml

@@ -995,7 +995,8 @@
     SET HISTORY_SHIPPING_ADDRESS_ID = SALE_SHIPPING_ADDRESS_ID
     WHERE SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
   </update>
-  <select id="getDeatailsOrder" resultType="java.math.BigDecimal" parameterType="java.math.BigDecimal">
+
+    <select id="getDeatailsOrder" resultType="java.math.BigDecimal" parameterType="java.math.BigDecimal">
     SELECT BDO.DETAILS_ID from TMSTRUCK_WEIGHT_RESULT ttr
     LEFT JOIN BMSTRUCK_DETAILS_ORDER BDO
     ON BDO.WEIGHT_TASK_RESULT_ID = TTR.WEIGHT_TASK_RESULT_ID
@@ -1034,4 +1035,9 @@
       AND
       ASO.SALE_NUMBER = #{saleOrderNo}
   </select>
+  <update id="updateSaleOrderReceipt">
+    UPDATE AMS_SALE_ORDER_MATERIAL ASOM
+    SET ASOM.SALE_DATE_OF_RECEIPT = #{receiptDateByDate}
+    WHERE ASOM.SALE_ORDER_ID = #{saleOrderId}
+  </update>
 </mapper>