Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-AMS-API

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

@@ -1121,6 +1121,7 @@ public class AmsSaleOrderController extends BaseRESTfulController {
         return success(result);
     }
 
+
     /**
      * 修改销售订单中的物资
      *
@@ -1353,6 +1354,77 @@ public class AmsSaleOrderController extends BaseRESTfulController {
         return success(result);
     }
 
+    /**
+     * @author:zyf
+     * @version:1.0
+     * @Date:2022-10-20
+     * @Description:批量关闭分录
+     */
+    @ApiOperation(value = "关闭分录")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "list", value = "批量关闭分录", required = false, dataType = "java.util.List")
+    })
+    @PostMapping(value = "/closingEntries")
+    @Transactional
+    public RESTfulResult closingEntries(@RequestBody List<Map<String, Object>> mapList){
+        if (mapList.isEmpty()){
+            return failed("没有分录数据");
+        }else {
+            try{
+                for (Map<String, Object> map : mapList) {
+                    String reason="关闭每日八点之前的订单";
+                    String number="";
+                    String closeEntryId="";
+                    BigDecimal closeWlEntryId=BigDecimal.ZERO;
+                    if (!("".equals(map.get("number")))&&map.get("number")!=null){
+                        number = (String)map.get("number");
+                    }else {
+                        continue;
+                    }
+                    if (!("".equals(map.get("closeEntryId")))&&map.get("closeEntryId")!=null){
+                        closeEntryId =(String) map.get("closeEntryId");
+                    }else {
+                        continue;
+                    }
+                    if (!("".equals(map.get("saleMaterialId")))&&map.get("saleMaterialId")!=null){
+                        closeWlEntryId=DataChange.dataToBigDecimal(map.get("saleMaterialId"));
+                    }else {
+                        continue;
+                    }
+                    amsSaleOrderService.updateAMSDeleted(closeWlEntryId);
+                    String wholeOrder = "0";
+                    String status = "close";
+                    //需要的数据
+                    Map<String,Object> head = new HashMap<>();
+                    // 销售订单号
+                    head.put("number",number);
+                    // 关闭原因
+                    head.put("reason",reason);
+                    // 金蝶分录
+                    head.put("closeEntryId",closeEntryId);
+                    // 是否整单：（0：分录，1：整单）
+                    head.put("wholeOrder",wholeOrder);
+                    // 物流销售订单分录主键
+                    head.put("closeWlEntryId",closeWlEntryId);
+                    // 状态：close为关闭
+                    head.put("status",status);
+                    Map<String,Object> input = new HashMap<>();
+                    Map<String, Object> totalMap = easUtil.getTotalMap();
+                    input.put("head",head);
+                    totalMap.put("input",input);
+                    // 调用金蝶关闭接口
+                    String json = JSONUtils.toJSONString(totalMap);
+                    System.out.println(json);
+                    Map<String,Object> resultMap = joinFeign.deleteSaleOrderToEas(totalMap);
+                    System.out.println(resultMap);
+                }
+            }catch (Exception e){
+                System.out.println("e"+e.getMessage());
+            }
+        }
+        return success("分录成功删除");
+    }
+
     @ApiModelProperty(value = "展示已审核化产焦炭销售订单列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),

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

@@ -80,6 +80,10 @@ public interface AmsSaleOrderMapper extends IBaseMapper<AmsSaleOrder, BigDecimal
     BigDecimal getCarNum(BigDecimal saleOrderId);
     // 查询销售订单下的车序号和物资
     List<Map<String, Object>> getTruckNoAndMaterial(Map<String,Object> map);
+
+    //关闭deleted
+    int updateAMSDeleted(BigDecimal closeWlEntryId);
+
     // 根据详细地址匹配省市县
     BigDecimal getAddressByPlace(BigDecimal placeId);
     // 根据省市县匹配承运商

src/main/java/com/steerinfo/dil/service/IAmsSaleOrderService.java

@@ -163,6 +163,8 @@ public interface IAmsSaleOrderService {
     List<Map<String, Object>> getSaleMaterialId(BigDecimal saleOrderMaterialId);
     // 查询下发给承运商的车序号信息
     List<Map<String, Object>> getCarrierTruckNoAndMaterialList(Map<String, Object> map);
+    //设置销售订单分录物资中间表的deleted为1
+    int updateAMSDeleted(BigDecimal closeWlEntryId);
     // 关闭单个钢材物资分录
     int closeSteelMaterialId(Map<String, Object> mapValue);
     // 展示已审核化产焦炭销售订单列表

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

@@ -1956,6 +1956,12 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         return mapList;
     }
 
+    @Override
+    public int updateAMSDeleted(BigDecimal closeWlEntryId) {
+        return amsSaleOrderMapper.updateAMSDeleted(closeWlEntryId);
+    }
+
+
     /**
      * 同步关闭金蝶物资分录
      * @param mapValue

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

@@ -4627,4 +4627,10 @@
     SELECT IS_OK "isOk" FROM AMS_DISPATCH_SWITCH
     fetch NEXT 1 rows only
   </select>
+
+  <update id="updateAMSDeleted">
+    update AMS_SALE_MATERIAL ASM
+    set ASM.DELETED=1
+    where ASM.SALE_MATERIAL_ID=#{closeWlEntryId}
+  </update>
 </mapper>