Merge remote-tracking branch 'origin/master'

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

@@ -240,10 +240,10 @@ public class DilNoticeController extends BaseRESTfulController {
     @ApiOperation(value = "查询通知信息", notes = "根据传过来的orgcode查询")
     @PostMapping(value = "/getNotice")
     public RESTfulResult getNotice(@RequestBody(required = false) Map<String, Object> mapValue){
-        return failed(null);
         /*String orgcode= (String) mapValue.get("orgcodezs");
-        List<Map<String, Object>> noticeData = dilNoticeService.getNoticeData(orgcode);*/
-        //return success(noticeData);
+        List<Map<String, Object>> noticeData = dilNoticeService.getNoticeData(orgcode);
+        return success(noticeData);*/
+        return null;
     }
 
 

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

@@ -63,4 +63,5 @@ public interface AmsSaleOrderMaterialMapper extends IBaseMapper<AmsSaleOrderMate
 
     //更新收货客户
     int updateInwardConsignee(Map<String, Object> mapValue);
+
 }

src/main/java/com/steerinfo/dil/model/AmsSaleOrderMaterial.java

@@ -117,6 +117,20 @@ public class AmsSaleOrderMaterial implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="车号备注",required=false)
     private String truckRemark;
 
+    /**
+    * 收货地址ID(用来存储多个地址ID)(SHIPPING_ADDRESS_IDS)
+    */
+    @ApiModelProperty(value = "收货地址ID(用来存储多个地址ID)",required = false)
+    private String shippingAddressIds;
+
+    public String getShippingAddressIds() {
+        return shippingAddressIds;
+    }
+
+    public void setShippingAddressIds(String shippingAddressIds) {
+        this.shippingAddressIds = shippingAddressIds;
+    }
+
     private static final long serialVersionUID = 1L;
 
     @Override

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

@@ -1445,9 +1445,12 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         BigDecimal shippingAddressId = DataChange.dataToBigDecimal(mapValue.get("shipperAddressId"));
         // 具体地址
         String place = (String) mapValue.get("place");
+        Integer addressid1= (Integer) mapValue.get("placeId");
+        BigDecimal addressid2 =BigDecimal.ZERO;
         AmsSaleOrderMaterial amsSaleOrderMaterial = amsSaleOrderMaterialMapper.selectByPrimaryKey(saleOrderMaterialId);
-        if (place != null && !"null".equals(place)) {
+        if (place != null && !("".equals(place))) {
             List<Map<String, Object>> placeIdList = amsSaleOrderMaterialMapper.getPlaceId(place,shippingAddressId);
+            addressid2 =(BigDecimal) placeIdList.get(0).get("placeId");
             if (placeIdList == null || placeIdList.size() == 0) {
                 RmsReceivePlace rmsReceivePlace = new RmsReceivePlace();
                 rmsReceivePlace.setPlaceId(rmsReceivePlaceMapper.selectMaxId());
@@ -1459,6 +1462,9 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                 amsSaleOrderMaterial.setSaleShippingAddressId((BigDecimal) placeIdList.get(0).get("placeId"));
             }
         }
+        String addressids="";
+        addressids =addressid1+","+addressid2;
+        amsSaleOrderMaterial.setShippingAddressIds(addressids);
         result += amsSaleOrderMaterialMapper.updateByPrimaryKeySelective(amsSaleOrderMaterial);
         // 需要换车
         if (isNewCar != null && (Integer) isNewCar == 0) {
@@ -1728,6 +1734,13 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             return 1;
         }
         if (lineSequence == null || "0".equals(lineSequence.toString()) || "1".equals(lineSequence.toString()) || "2".equals(lineSequence.toString())) {
+            String capacityids="";
+            Integer capacityid1= (Integer) mapValue.get("capacityIds");
+            Integer capacityid2= (Integer) mapValue.get("capacityId");
+            if (capacityid1!=null && !("".equals(capacityid1))){
+                capacityids=capacityid1+","+capacityid2;
+            }
+            mapValue.put("capacityids",capacityids);
             //这是修改车牌号
             //将排队信息删掉
             Map<String, Object> isSpellingMap = omstruckOrderMapper.getSteelIsSpelling(DataChange.dataToBigDecimal(mapValue.get("orderId")));

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

@@ -4221,6 +4221,7 @@
   <update id="updateCapacityNumberInFactory" parameterType="java.util.Map" >
     UPDATE OMSTRUCK_ORDER OO
     SET OO.CAPACITY_ID = #{capacityId},
+        OO.CAPACITYIDS=#{capacityids},
         OO.insert_update_remark = '修改车牌号'
     WHERE OO.ORDER_ID = #{orderId}
   </update>

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

@@ -20,18 +20,19 @@
     <result column="STEEL_RECEIPT_DATE" jdbcType="TIMESTAMP" property="steelReceiptDate" />
     <result column="PRICE_ID" jdbcType="DECIMAL" property="priceId" />
     <result column="TRUCK_REMARK" jdbcType="VARCHAR" property="truckRemark" />
+    <result column="SHIPPING_ADDRESS_IDS" jdbcType="VARCHAR" property="shippingAddressIds" />
   </resultMap>
   <sql id="columns">
     SALE_ORDER_MATERIAL_ID, SALE_ORDER_ID, SALE_ORDER_MATERIAL_TRUCK_NO, SALE_SHIPPING_ADDRESS_ID,
     SALE_DATE_OF_RECEIPT, SALE_ORDER_CONSIGNEE, SALE_ORDER_CONSIGNEE_TEL, INSERT_USERNAME,
     INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, UPDATED,
-    ISSUE_STATUS, STEEL_RECEIPT_DATE, PRICE_ID, TRUCK_REMARK
+    ISSUE_STATUS, STEEL_RECEIPT_DATE, PRICE_ID, TRUCK_REMARK ,SHIPPING_ADDRESS_IDS
   </sql>
   <sql id="columns_alias">
     t.SALE_ORDER_MATERIAL_ID, t.SALE_ORDER_ID, t.SALE_ORDER_MATERIAL_TRUCK_NO, t.SALE_SHIPPING_ADDRESS_ID,
     t.SALE_DATE_OF_RECEIPT, t.SALE_ORDER_CONSIGNEE, t.SALE_ORDER_CONSIGNEE_TEL, t.INSERT_USERNAME,
     t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED,
-    t.UPDATED, t.ISSUE_STATUS, t.STEEL_RECEIPT_DATE, t.PRICE_ID, t.TRUCK_REMARK
+    t.UPDATED, t.ISSUE_STATUS, t.STEEL_RECEIPT_DATE, t.PRICE_ID, t.TRUCK_REMARK,t.SHIPPING_ADDRESS_IDS
   </sql>
   <sql id="select">
     SELECT <include refid="columns" /> FROM AMS_SALE_ORDER_MATERIAL
@@ -422,6 +423,9 @@
       <if test="truckRemark != null">
         TRUCK_REMARK = #{truckRemark,jdbcType=VARCHAR},
       </if>
+      <if test="shippingAddressIds !=null">
+        SHIPPING_ADDRESS_IDS = #{shippingAddressIds,jdbcType=VARCHAR}
+      </if>
     </set>
     where SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId,jdbcType=DECIMAL}
   </update>

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

@@ -510,14 +510,17 @@
 <!--  /*   DN.INSERT_TIME =  DN.PERMISSION =#{permission} OR DN.PERMISSION =0 AND*/-->
 
   <!--获取信息-->
-  <select id="getNoticeData" resultType="java.util.Map">
+  <select id="getNoticeData" parameterType="java.math.BigDecimal" resultType="java.util.Map">
     select t.NOTICE_TITLE AS "noticetitle",
     t.NOTICE_CONTENT AS "noticecontent",
     t.INSERT_USERNAME AS "insertusername",
     t.INSERT_TIME AS "inserttime",
-    (select count(*) INSERT_USERNAME from DIL_NOTICE) AS "taskAllNum"
+    (select count(*) INSERT_USERNAME from DIL_NOTICE
+    where PERMISSION=#{permission} and Deleted =0 or PERMISSION is null) AS "taskAllNum"
     from DIL_NOTICE t
-    where t.PERMISSION=#{permission} or t.PERMISSION is null
+    where t.PERMISSION=#{permission}
+    and t.Deleted =0
+    or t.PERMISSION is null
   </select>
 
   <!--获取信息-->
@@ -527,8 +530,9 @@
     t.NOTICE_CONTENT AS "noticecontent",
     t.INSERT_USERNAME AS "insertusername",
     t.INSERT_TIME AS "inserttime",
-    (select count(*) INSERT_USERNAME from DIL_NOTICE) AS "taskAllNum"
+    (select count(*) INSERT_USERNAME from DIL_NOTICE where PERMISSION is null) AS "taskAllNum"
     from DIL_NOTICE t
     where t.PERMISSION is null
+    and t.Deleted =0
   </select>
 </mapper>