zi-wms-pda/src/main/java/com/cim/idm/controller/DeliveryController.java

@@ -205,13 +205,4 @@ public class DeliveryController {
 		}
 		return AjaxResult.me().setErrorCode(-1).setMessage("修改失败");
 	}
-
-	/**
-	 * 获取采购订单详情
-	 */
-	@PostMapping(value = "/getDeliveryReceiveDetail")
-	public AjaxResult GetDeliveryReceiveDetail(@RequestBody JSONObject in) {
-		List<String> nameList = (List<String>) in.get("nameList");
-		return AjaxResult.me().setSuccess(true).setResultObj(deliveryService.getDeliveryReceiveDetail(nameList));
-	}
 }

zi-wms-pda/src/main/java/com/cim/idm/dao/DeliveryDao.java

@@ -109,13 +109,6 @@ public interface DeliveryDao {
      */
     List<DeliveryReceiveDetailVo> getReceiveDetail(@Param("nameList") List<String> nameList);
 
-    /**
-     * 根据到库单获取采购单名称
-     * @param nameList 到库单
-     * @return 采购单名称列表
-     */
-    List<DeliveryReceiveDetailVo> getDeliveryReceiveDetail(@Param("nameList") List<String> nameList);
-
     /**
      * 获取到货单
      * @param dto 请求
@@ -159,11 +152,4 @@ public interface DeliveryDao {
     @MapKey("storeCharge")
     List<Map<String, Object>> getStoreChargeSort(@Param("siteName") String siteName,
                                              @Param("documentName") String documentName);
-
-    /**
-     * 更新入库单数量
-     * @param relationDto
-     * @return
-     */
-    int updateMaterialReceiveRequestDetailQty(@Param("dto") DeliveryRelationDto relationDto);
 }

zi-wms-pda/src/main/java/com/cim/idm/service/IDeliveryService.java

@@ -95,12 +95,7 @@ public interface IDeliveryService {
      * @return 采购单名称列表
      */
     List<DeliveryReceiveDetailVo> getReceiveDetail(List<String> nameList);
-    /**
-     * 根据到库单获取采购单名称
-     * @param nameList 到库单
-     * @return 采购单名称列表
-     */
-    List<DeliveryReceiveDetailVo> getDeliveryReceiveDetail(List<String> nameList);
+
     /**
      * 获取到货单
      * @param dto 请求

zi-wms-pda/src/main/java/com/cim/idm/service/Impl/DeliveryServiceImpl.java

@@ -50,14 +50,6 @@ public class DeliveryServiceImpl implements IDeliveryService {
         if (deliveryDao.createRelation(res) <= 0) {
             throw new GlobalException("添加到库单关系失败");
         }
-        //更新采购订单行项的已入库数量
-        for (DeliveryRelationDto re : res) {
-            if (deliveryDao.updateMaterialReceiveRequestDetailQty(re) <= 0){
-                throw new GlobalException("更新采购单入库数量失败");
-            }
-        }
-
-
         // 添加到库单
         return deliveryDao.createDelivery(dto, DeliveryStateEnums.CREATE.getCode());
     }
@@ -128,11 +120,6 @@ public class DeliveryServiceImpl implements IDeliveryService {
         return deliveryDao.getReceiveDetail(nameList);
     }
 
-    @Override
-    public List<DeliveryReceiveDetailVo> getDeliveryReceiveDetail(List<String> nameList) {
-        return deliveryDao.getDeliveryReceiveDetail(nameList);
-    }
-
     @Override
     public PageInfo<MaterialDelivery> getDeliveryList(PageDto dto) {
         PageMethod.startPage(dto.getPageNum(), dto.getPageSize());

zi-wms-pda/src/main/java/com/cim/idm/service/Impl/MaterialPackingServiceServiceImpl.java

@@ -225,7 +225,7 @@ public class MaterialPackingServiceServiceImpl implements IMaterialPackingServic
                     break;
                 }
                 if (queryMaterialpackingList.isEmpty()){
-                    throw new Exception("冲销失败，没有匹配该物料凭证：" + mblnr + "的消耗记录无法冲销");
+                    throw new Exception("冲销失败，物料：" + matnr + " " + werks + " " + lgort + " " + meins + "库存短缺");
                 }else {
                     MaterialPackingServiceProxy.getMaterialPackingService().setEvent(materialPackingKeyList, eventInfo, setEventInfoList);
                 }

zi-wms-pda/src/main/resources/com/cim/idm/dao/DeliveryDao.xml

@@ -501,22 +501,4 @@
                  ORDER BY A.CHARGE
              ) TTT
     </select>
-
-    <update id="updateMaterialReceiveRequestDetailQty">
-        UPDATE MATERIALRECEIVEREQUESTDETAIL
-        SET RECEIVEDQUANTITY = #{dto.deliveryNum}
-        WHERE RECEIVEREQUESTNAME = #{dto.receiveRequestName}
-          AND RECEIVEREQUESTDETAILNAME = #{dto.receiveRequestDetailName}
-          AND MATERIALSPECNAME = #{dto.materialSpecName}
-    </update>
-
-    <select id="getDeliveryReceiveDetail" resultType="com.cim.idm.model.vo.DeliveryReceiveDetailVo">
-        SELECT receiveRequestName, materialSpecName, requestQuantity, requestQuantity - receivedQuantity as deliveryNum, RECEIVEREQUESTDETAILNAME
-        FROM MATERIALRECEIVEREQUESTDETAIL
-        WHERE RECEIVEREQUESTNAME in
-        <foreach item="name" index="index" collection="nameList" open="(" separator="," close=")">
-            #{name}
-        </foreach>
-        order by RECEIVEREQUESTDETAILNAME
-    </select>
 </mapper>