Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

chenlu

2024-11-18 0e05a38203ab2c60d89890698e0b34d9d7ab5eb0

Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

 north-glass-erp/northglass-erp/src/views/mm/productStock/StorageRecord.vue

@@ -279,10 +279,12 @@

            })
            request.post("/finishedGoodsInventory/cancelFinishedGoodsInventoryStorage",flowData.value).then((res) => {
              if(res.code==200 && res.data===true){
              if(res.code==200 && res.data==="true"){
                ElMessage.success(t('productStock.invalidSuccessfully'))
                router.push({path:'/main/productStock/storageRecord',query:{random:Math.random(),storageType: type.value}})

              }else if(res.data==="false1"){
                ElMessage.warning("发货单已创建")
              }else{
                ElMessage.warning(t('productStock.cancellationFailed'))
              }

 north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedGoodsInventoryMapper.java

@@ -3,10 +3,7 @@
import com.example.erp.entity.mm.FinishedGoodsInventory;
import com.example.erp.entity.mm.FinishedOperateLog;
import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.sd.DeliveryDetail;
import com.example.erp.entity.sd.Order;
import com.example.erp.entity.sd.OrderDetail;
import com.example.erp.entity.sd.Product;
import com.example.erp.entity.sd.*;
import com.example.erp.entity.userInfo.User;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -47,6 +44,8 @@

    Integer findOrderQuantity(String orderId);

    Delivery findOrderDelivery(String orderId);

    Integer findOrderNumberdsum(String orderId);

    Integer findOrderDeliveryQuantitySum(String orderId);

 north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java

@@ -8,6 +8,7 @@
import com.example.erp.entity.mm.FinishedGoodsInventory;
import com.example.erp.entity.mm.FinishedOperateLog;
import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.sd.Delivery;
import com.example.erp.entity.sd.DeliveryDetail;
import com.example.erp.entity.sd.Order;
import com.example.erp.entity.sd.OrderDetail;
@@ -677,8 +678,8 @@
    }


    public Boolean cancelFinishedGoodsInventoryStorage(Map<String,Object> object) {
        boolean saveState = true;
    public String cancelFinishedGoodsInventoryStorage(Map<String,Object> object) {
        String saveState = "true";
        //设置回滚点
        Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
        try {
@@ -696,27 +697,34 @@
                    Integer deliverydetailsum = finishedGoodsInventoryMapper.findDeliverydetailsum(finishedOperateLog.getOperationOrderNumber(),1);

                    if(Objects.equals(finishedOperateLog.getOperateType(), "入库")){
                        //修改记录表
                        finishedOperateLogMapper.updateFinishedOperateLogState(finishedOperateLog,"已作废");
                        //修改库存表入库数量
                        finishedGoodsInventoryMapper.updateInventoryOut(finishedOperateLog);
                        if(finishedOperateLog.getProcessId()!=null){
                            //修改流程卡表入库数量
                            finishedGoodsInventoryMapper.updateflowcardOut(finishedOperateLog);
                        Delivery delivery = finishedGoodsInventoryMapper.findOrderDelivery(finishedOperateLog.getOrderId());
                        if(delivery==null){
                            //修改记录表
                            finishedOperateLogMapper.updateFinishedOperateLogState(finishedOperateLog,"已作废");
                            //修改库存表入库数量
                            finishedGoodsInventoryMapper.updateInventoryOut(finishedOperateLog);
                            if(finishedOperateLog.getProcessId()!=null){
                                //修改流程卡表入库数量
                                finishedGoodsInventoryMapper.updateflowcardOut(finishedOperateLog);
                            }

                            //修改订单明细表入库数量
                            finishedGoodsInventoryMapper.updateOutOrderNumberConut(finishedOperateLog.getOrderId(),finishedOperateLog.getOperationNumber(),finishedOperateLog.getQuantity());
                            //判断订单是否全部入库
                            if (Objects.equals(ordersum, ordernumbersum)) {
                                //修改订单表入库状态
                                finishedGoodsInventoryMapper.updateOrderWarehousingState(finishedOperateLog.getOrderId(),1);
                            }
                            if (ordernumbersum-finishedOperateLog.getQuantity()==0) {
                                //修改订单表入库状态
                                finishedGoodsInventoryMapper.updateOrderWarehousingState(finishedOperateLog.getOrderId(),0);
                            }
                            log.setFunction("cancelFinishedGoodsInventoryStorage入库");
                        }else{
                            return "false1";
                        }

                        //修改订单明细表入库数量
                        finishedGoodsInventoryMapper.updateOutOrderNumberConut(finishedOperateLog.getOrderId(),finishedOperateLog.getOperationNumber(),finishedOperateLog.getQuantity());
                        //判断订单是否全部入库
                        if (Objects.equals(ordersum, ordernumbersum)) {
                            //修改订单表入库状态
                            finishedGoodsInventoryMapper.updateOrderWarehousingState(finishedOperateLog.getOrderId(),1);
                        }
                        if (ordernumbersum-finishedOperateLog.getQuantity()==0) {
                            //修改订单表入库状态
                            finishedGoodsInventoryMapper.updateOrderWarehousingState(finishedOperateLog.getOrderId(),0);
                        }
                        log.setFunction("cancelFinishedGoodsInventoryStorage入库");


                    }else if(Objects.equals(finishedOperateLog.getOperateType(), "出库")){
                        //修改记录表
@@ -756,7 +764,7 @@
            sysError.setError(e+Arrays.toString(e.getStackTrace()));
            sysError.setFunc("cancelFinishedGoodsInventoryStorage");
            sysErrorService.insert(sysError);
            saveState = false;
            saveState = "false";

        }
        return saveState;

 north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml

@@ -436,6 +436,10 @@
        select quantity from sd.`delivery`  where delivery_id=#{deliveryId}
    </select>

    <select id="findOrderDelivery" >
        select * from sd.`delivery`  where order_id=#{orderId}
    </select>

    <select id="findDeliverydetailsum"  >
        select ifnull(sum(quantity),0) from sd.`delivery_detail`  where delivery_id=#{deliveryId} and delivery_detail_state=#{deliveryDetailState}
    </select>