Merge remote-tracking branch 'origin/master'

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

@@ -518,7 +518,10 @@ public class AmsSaleOrderController extends BaseRESTfulController {
             }else if (i==3){
                 columnData.put("min-width","98px");
             }
-            columnData.put("filters", setListMap(amsSaleOrder1, columnData.get("prop").toString()));
+            if (DataChange.dataToBigDecimal(columnData.get("isFilter")).intValue() != 0) {
+                columnData.put("filters", setListMap(amsSaleOrder1, columnData.get("prop").toString()));
+            }
+
             i++;
         }
         PageListAdd pageList = new PageListAdd(amsSaleOrder1);
@@ -568,7 +571,7 @@ public class AmsSaleOrderController extends BaseRESTfulController {
         DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);//根据时间段查询数据
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> amsSaleOrder1 = amsSaleOrderService.getSaleOrderReportedes(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData4(apiId, null,amsSaleOrder1);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,amsSaleOrder1);
         return success(pageList);
     }
 
@@ -605,17 +608,6 @@ public class AmsSaleOrderController extends BaseRESTfulController {
         }
         mapValue.put("saleType",saleType);
         DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);//根据时间段查询数据
-//        SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd");
-//        if(startDate != null  && !"".equals(startDate) && !"null".equals(startDate)){
-//            Date startTime=new Date(Long.parseLong(startDate));
-//            String startTime1=simpleDateFormat.format(startTime);
-//            mapValue.put("startTime",startTime1);
-//        }
-//        if(endDate != null  && !"".equals(endDate) && !"null".equals(endDate)){
-//            Date endTime=new Date(Long.parseLong(endDate));
-//            String endTime1=simpleDateFormat.format(endTime);
-//            mapValue.put("endTime",endTime1);
-//        }
         //不分页筛选数据
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
@@ -634,7 +626,9 @@ public class AmsSaleOrderController extends BaseRESTfulController {
             }else if (i==3){
                 columnData.put("min-width","96px");
             }
-            columnData.put("filters", setListMap(saleOrderList, columnData.get("prop").toString()));
+            if (DataChange.dataToBigDecimal(columnData.get("isFilter")).intValue() != 0) {
+                columnData.put("filters", setListMap(saleOrderList,columnData.get("prop").toString()));
+            }
             i++;
         }
         PageListAdd pageList = new PageListAdd(saleOrderList);

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

@@ -589,6 +589,9 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         // 业务员
         BigDecimal salerId = DataChange.dataToBigDecimal(mapValue.get("salerId"));
         if (salerId == null || salerId.intValue() == 0) {
+            if(mapValue.get("salerName") == null) {
+                throw new Exception("您输入的业务员为空,请检查后再导入!!");
+            }
             salerId = amsSaleOrderMapper.findSalerId(mapValue.get("salerName"));
             if (salerId == null) {
                 throw new Exception("您输入的业务员：" + mapValue.get("salerName") +"不存在！！");

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

@@ -276,7 +276,7 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
         BigDecimal checkCount = DataChange.dataToBigDecimal(map.get("checkCount"));
         BigDecimal checkWeight = DataChange.dataToBigDecimal(map.get("checkWeight"));
         //根据抽查重量和抽取支数计算单支重量平均值
-        BigDecimal singleWeight = checkWeight.divide(checkCount, RoundingMode.HALF_UP);
+        BigDecimal singleWeight = checkWeight.divide(checkCount, 3,RoundingMode.HALF_UP);
         RmsCheckInfo rmsCheckInfo = new RmsCheckInfo();
         //获取主键
         rmsCheckInfo.setCheckId(new BigDecimal(rmsCheckInfoMapper.getMaxId()));

src/main/java/com/steerinfo/dil/util/ColumnDataUtil.java

@@ -29,7 +29,9 @@ public class ColumnDataUtil {
         List<Map<String, Object>> columnDataList = columnDataFeign.getColumnData(apiId);
         for (Map<String, Object> columnData : columnDataList) {
             //每个表头字段的过滤条件
-            columnData.put("filters", setListMap(data, columnData.get("prop").toString()));
+            if(columnData.get("isFilter") == null || DataChange.dataToBigDecimal(columnData.get("isFilter")).intValue() == 1) {
+                columnData.put("filters", setListMap(data, columnData.get("prop").toString()));
+            }
         }
         PageListAdd pageList = new PageListAdd(data);
         pageList.setColumnData(columnDataList);

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

@@ -1750,18 +1750,6 @@
           "saleOrderReceiveCustomer" like '%${item}%'
         </foreach>
       </if>
-      <if test="saleUnitPrice != null">
-        and
-        <foreach collection="saleUnitPrice" item="item" open="(" separator="or" close=")">
-          "saleUnitPrice" like '%${item}%'
-        </foreach>
-      </if>
-      <if test="saleOrderTax != null">
-        and
-        <foreach collection="saleOrderTax" item="item" open="(" separator="or" close=")">
-          "saleOrderTax" like '%${item}%'
-        </foreach>
-      </if>
       <if test="saleRemark != null">
         and
         <foreach collection="saleRemark" item="item" open="(" separator="or" close=")">
@@ -1769,7 +1757,7 @@
         </foreach>
       </if>
     </where>
-    <include refid="orderBy"></include>
+    <include refid="orderBy1"></include>
   </select>
 
   <!-- 销售公司查询已审核的焦炭销售订单 -->

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

@@ -1519,13 +1519,25 @@
         AND ARM.MATERIAL_LUNO IS NOT NULL
         AND OO.ORDER_STATUS IN (2,4,5)
         AND OO.ORDER_TYPE = 11
-        <if test="oneDate != null">
+        <if test="oneDate != null and queryHeatNo == null">
             and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= AIR.INSERT_TIME
         </if>
         <if test="startDate != null">
             and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= AIR.INSERT_TIME
             and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= AIR.INSERT_TIME
         </if>
+        <if test="shift != null">
+            and AIR.REQUIREMENT_SHIFT like #{shift}
+        </if>
+        <if test="clazz != null">
+            and AIR.REQUIREMENT_CLASS like #{clazz}
+        </if>
+        <if test="queryHeatNo != null">
+            and ARM.MATERIAL_LUNO like #{queryHeatNo}
+        </if>
+        <if test="queryPoint != null">
+            and rw1.warehouse_name like #{queryPoint}
+        </if>
         Order by air.insert_time desc
         )
     </select>