'销售订单接口'

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

@@ -12,7 +12,7 @@ import java.util.Map;
 @Mapper
 public interface RmsMaterialMapper extends IBaseMapper<RmsMaterial, BigDecimal> {
 
-    @Select("select seq_RMS_MATERIAL.nextval from dual")
+    @Select("SELECT seq_RMS_MATERIAL.nextval FROM dual")
     BigDecimal getMaterialId();
 
     @Override

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

@@ -13,6 +13,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -114,6 +116,9 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             String receiveUnit = (String) mapVal.get("receiveUnit");
             // 得到收货单位名称
             String receiveUnitName = (String) mapVal.get("receiveUnitName");
+            // 得到订单日期
+            String saleOrderBizDateStr = (String) mapVal.get("saleOrderBizDate");
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
             BigDecimal receiveId = amsSaleOrderMapper.getReceiveId(receiveUnit);
             // 如果不存则自己增收获单位
             if (receiveId == null) {
@@ -142,13 +147,19 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                 amsSaleOrder.setSaleOrderId(saleOrderId);
                 amsSaleOrder.setSaleNumber(saleNumber);
                 amsSaleOrder.setDeleted(new BigDecimal(0));
-                amsSaleOrder.setInsertTime(new Date());
                 amsSaleOrder.setUpdateTime(new Date());
                 amsSaleOrder.setInsertUsername("admin");
                 amsSaleOrder.setInsertUpdateRemark("金蝶采集销售订单");
                 amsSaleOrder.setUpdateUsername("admin");
                 amsSaleOrder.setReceiveId(receiveId);
                 amsSaleOrder.setShipperId(shipperId);
+                // 订单日期
+                try {
+                    Date saleOrderBizDate = sdf.parse(saleOrderBizDateStr);
+                    amsSaleOrder.setInsertTime(saleOrderBizDate);
+                } catch (ParseException e) {
+                    e.printStackTrace();
+                }
                 if (shipperUnit.equals("四川达兴能源有限责任公司") && receiveUnitName.equals("四川省达州钢铁集团有限责任公司")) {
                     amsSaleOrder.setCloseStatus(new BigDecimal(0));
                 }