no message

skyouc

7 天以前 1af222e201ad79526abca68c71207286ddf49188

no message

 rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx

@@ -109,6 +109,13 @@
                empty={false}
                filters={filters}
                sort={{ field: "create_time", order: "desc" }}
                sx={{
                    flexGrow: 1,
                    transition: (theme) =>
                        theme.transitions.create(['all'], {
                            duration: theme.transitions.duration.enteringScreen,
                        }),
                }}
                actions={(
                    <TopToolbar>
                        <FilterButton />
@@ -174,13 +181,13 @@
                <NumberField source="anfme" label="table.field.warehouseAreasItem.anfme" />,
                <NumberField source="workQty" label="table.field.warehouseAreasItem.workQty" />,
                <NumberField source="qty" label="table.field.warehouseAreasItem.qty" />,
                <MyField source="isptQty" label="table.field.qlyIsptItem.anfme"
                    onClick={(event, record, val) => {
                        event.stopPropagation();
                        setItemInfo(record)
                        setDrawerVal(!!drawerVal && drawerVal === val ? null : val);
                    }}
                />,
                // <MyField source="isptQty" label="table.field.qlyIsptItem.anfme"
                //     onClick={(event, record, val) => {
                //         event.stopPropagation();
                //         setItemInfo(record)
                //         setDrawerVal(!!drawerVal && drawerVal === val ? null : val);
                //     }}
                // />,
                <TextField source="splrBatch" label="table.field.warehouseAreasItem.splrBtch" />,
                <TextField source="batch" label="table.field.warehouseAreasItem.batch" />,
                <TextField source="unit" label="table.field.warehouseAreasItem.unit" />,

 rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java

@@ -128,7 +128,7 @@
//                }

                if (!asnOrderService.update(new LambdaUpdateWrapper<AsnOrder>()
                        .set(AsnOrder::getQty, order.getQty())
                        .set(AsnOrder::getQty, order.getAnfme())
                        .set(AsnOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_RECEIPT_DONE.val)
                        .eq(AsnOrder::getId, order.getId()))) {
                    throw new CoolException("收货单状态修改失败！！");

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java

@@ -110,17 +110,23 @@
            if (Objects.isNull(orderItem)) {
                throw new CoolException("收货单据不存在！！");
            }
            Double sum = item.getDisQty() + item.getSafeQty();

            Double disQty = Objects.isNull(item.getDisQty()) ? 0 : item.getDisQty();
            Double safeQty = Objects.isNull(item.getSafeQty()) ? 0 : item.getSafeQty();

            Double sum = disQty + safeQty;
            orderItem.setIsptQty(sum);

            if (!warehouseAreasItemService.updateById(orderItem)) {
                throw new CoolException("收货区库存信息更新失败！！");
            }
            if (sum.compareTo(0.0) > 0) {
                if (!warehouseAreasItemService.updateById(orderItem)) {
                    throw new CoolException("收货区库存信息更新失败！！");
                }

            if (Objects.isNull(orderItem.getIsptResult())) {
                operateReceipt(item, orderItem);
            } else {
                if (Objects.isNull(orderItem.getIsptResult())) {
                    operateReceipt(item, orderItem);
                } else {

                }
            }
        }

@@ -146,19 +152,21 @@
     * @version 1.0
     */
    private void operateReceipt(QlyIsptItem item, WarehouseAreasItem orderItem) {
        Double sum = item.getDisQty() + item.getSafeQty();
        Double disQty = Objects.isNull(item.getDisQty()) ? 0 : item.getDisQty();
        Double safeQty = Objects.isNull(item.getSafeQty()) ? 0 : item.getSafeQty();
        Double sum = disQty + safeQty;
        if (sum.compareTo(orderItem.getAnfme()) >= 0) {
            //完成质检,做更新操作
            if (item.getSafeQty().compareTo(0.0) > 0) {
                orderItem.setIsptQty(item.getSafeQty());
            if (safeQty.compareTo(0.0) > 0) {
                orderItem.setIsptQty(safeQty);
                orderItem.setIsptResult(QlyIsptResult.QLY_ISPT_RESULT_EXCELLENT.val);
                if (!warehouseAreasItemService.updateById(orderItem)) {
                    throw new CoolException("收货区库存明细更新失败！！");
                }
            }

            if (item.getDisQty().compareTo(0.0) > 0) {
                orderItem.setIsptQty(item.getDisQty())
            if (disQty.compareTo(0.0) > 0) {
                orderItem.setIsptQty(disQty)
                        .setId(null)
                        .setIsptResult(QlyIsptResult.QLY_ISPT_RESULT_DEFECT.val);
                if (!warehouseAreasItemService.saveOrUpdate(orderItem)) {
@@ -167,8 +175,8 @@
            }
        } else {
            //未完成做添加操作
            if (item.getSafeQty().compareTo(0.0) > 0) {
                orderItem.setIsptQty(item.getSafeQty())
            if (safeQty.compareTo(0.0) > 0) {
                orderItem.setIsptQty(safeQty)
                        .setId(null)
                        .setIsptResult(QlyIsptResult.QLY_ISPT_RESULT_EXCELLENT.val);
                if (!warehouseAreasItemService.saveOrUpdate(orderItem)) {
@@ -176,8 +184,8 @@
                }
            }

            if (item.getDisQty().compareTo(0.0) > 0) {
                orderItem.setIsptQty(item.getDisQty())
            if (disQty.compareTo(0.0) > 0) {
                orderItem.setIsptQty(disQty)
                        .setId(null)
                        .setIsptResult(QlyIsptResult.QLY_ISPT_RESULT_DEFECT.val);
                if (!warehouseAreasItemService.saveOrUpdate(orderItem)) {