no message

skyouc

5 天以前 bbb4d1a7113c15edc2c2fdd26d1f8fa154c67908

no message

 rsf-admin/src/page/statistics/stockManage/WarehouseHistories.jsx

@@ -146,7 +146,7 @@
                                    }}
                                    title={"menu.stockItem"}
                                    empty={false}
                                    filter={{ stock: record }}
                                    filter={{ stock: record, aggType: record?.aggType }}
                                    sort={{ field: "create_time", order: "desc" }}
                                    actions={(
                                        <TopToolbar>

 rsf-admin/src/page/statistics/stockManage/WarehouseStockList.jsx

@@ -140,7 +140,7 @@


const DynamicFields = (props) => {
    const {setDrawerVal, setCreateDialog, setSelect} = props
    const { setDrawerVal, setCreateDialog, setSelect } = props
    const translate = useTranslate();
    const notify = useNotify();
    const [columns, setColumns] = useState([]);
@@ -213,13 +213,15 @@
    )
}


const HistoriesButton = ({ setDrawerVal, setSelect }) => {
    const record = useRecordContext();
    const { filterValues } = useListContext();

    const historyClick = (event) => {
        event.stopPropagation();
        setDrawerVal(true)
        setSelect(record)
        const objRecord = { ...record, ...filterValues }
        setSelect(objRecord)
    }
    return (
        <Button label="common.button.histories" onClick={historyClick}></Button>
@@ -228,11 +230,11 @@

const StockInfoButton = ({ setCreateDialog, setSelect }) => {
    const record = useRecordContext();
    const {filterValues} = useListContext();
    const { filterValues } = useListContext();
    const stockClick = (event) => {
        event.stopPropagation();
        setCreateDialog(true)
        const objRecord = {...record, ...filterValues}
        const objRecord = { ...record, ...filterValues }
        setSelect(objRecord)
    }


 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java

@@ -126,6 +126,8 @@
    private DeviceSiteMapper deviceSiteMapper;
    @Autowired
    private ConfigService configService;
    @Autowired
    private CompanysService companysService;

    /**
     * @return
@@ -347,6 +349,12 @@
    }

    private void extracted(Long loginUserId, ReceiptDetlsDto dto, WarehouseAreas areasItem, AsnOrderItem orderItem, AsnOrder asnOrder, Matnr matnr) {

        Companys companys = new Companys();
        if (StringUtils.isNoneBlank(orderItem.getSplrCode())) {
             companys = companysService.getOne(new LambdaQueryWrapper<Companys>().eq(Companys::getCode, orderItem.getSplrCode()));
        }

        WarehouseAreasItem item = new WarehouseAreasItem();
        item.setTrackCode(dto.getBarcode())
                .setAreaName(areasItem.getName())
@@ -355,6 +363,7 @@
                .setAsnCode(asnOrder.getCode())
                .setAsnId(asnOrder.getId())
                .setProdTime(dto.getProdTime())
                .setSplrId(companys.getId())
                .setWeight(dto.getWeigth())
                //库存单位为最小单位
                .setUnit(orderItem.getStockUnit())

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseStockController.java

@@ -87,7 +87,7 @@
        QueryWrapper<StockItem> wrapper = new QueryWrapper<>();

        if (type.equals(ViewStockType.VIEW_STOCK_TYPE_SUPPLIER.val)) {
            wrapper.eq("sprl_id", stock.getSplrId());
            wrapper.eq("splr_id", stock.getSplrId());
        } else if (type.equals(ViewStockType.VIEW_STOCK_TYPE_BATCH.val)) {
            wrapper.eq("batch", stock.getBatch());
        } else if (type.equals(ViewStockType.VIEW_STOCK_TYPE_WAREHOUSE.val)) {

 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/StockItem.java

@@ -116,6 +116,8 @@
    @ApiModelProperty(value= "供应商编码")
    private String splrCode;

    @ApiModelProperty("供应商ID")
    private Long splrId;
    /**
     * 库存批次
     */

 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreasItem.java

@@ -143,7 +143,7 @@
     * 供应商标识
     */
    @ApiModelProperty(value= "供应商标识")
    private String splrId;
    private Long splrId;

    /**
     * 收货重量
@@ -227,7 +227,7 @@

    public WarehouseAreasItem() {}

    public WarehouseAreasItem(Long areaId,String areaName,Long matnrId,String matnrName,String matnrCode,String trackCode,Double anfme,String batch,String unit,String stockUnit,String brand,Long shipperId,String splrId,Double weight,String prodTime,String splrBtch,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
    public WarehouseAreasItem(Long areaId,String areaName,Long matnrId,String matnrName,String matnrCode,String trackCode,Double anfme,String batch,String unit,String stockUnit,String brand,Long shipperId,Long splrId,Double weight,String prodTime,String splrBtch,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
        this.areaId = areaId;
        this.areaName = areaName;
        this.matnrId = matnrId;

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

@@ -71,7 +71,8 @@
    private WarehouseAreasService warehouseAreasService;
    @Autowired
    private WarehouseAreasItemServiceImpl warehouseAreasItemService;

    @Autowired
    private CompanysService companysService;

    /**
     * @author Ryan
@@ -87,7 +88,6 @@
        if (Objects.isNull(config)) {
            return;
        }

        if (!Boolean.parseBoolean(config.getVal())) {
            return;
        }
@@ -146,6 +146,11 @@
     * @version 1.0
     */
    private void extracted(WarehouseAreas areasItem, AsnOrderItem orderItem, AsnOrder asnOrder, Matnr matnr) {
        Companys companys = new Companys();
        if (StringUtils.isNoneBlank(orderItem.getSplrCode())) {
            companys = companysService.getOne(new LambdaQueryWrapper<Companys>().eq(Companys::getCode, orderItem.getSplrCode()));
        }

        WarehouseAreasItem item = new WarehouseAreasItem();
        item.setTrackCode(orderItem.getBarcode())
                .setAreaName(areasItem.getName())
@@ -154,6 +159,7 @@
                .setAsnCode(asnOrder.getCode())
                .setAsnId(asnOrder.getId())
                .setProdTime(orderItem.getProdTime())
                .setSplrId(companys.getId())
                //库存单位为最小单位
                .setUnit(orderItem.getStockUnit())
                .setStockUnit(orderItem.getStockUnit())

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

@@ -237,6 +237,7 @@
        if (items.isEmpty()) {
            throw new CoolException("质检单据明细不存在！！");
        }

        for (QlyIsptItem isptItem : items) {
            if (isptItem.getSafeQty().compareTo(0.0) <= 0 && isptItem.getDisQty().compareTo(0.0) <= 0 ) {
                continue;

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

@@ -16,6 +16,7 @@
import com.vincent.rsf.server.manager.service.QlyInspectService;
import com.vincent.rsf.server.manager.service.QlyIsptItemService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -40,6 +41,8 @@
    private QlyIsptItemService qlyIsptItemService;
    @Autowired
    private WarehouseAreasItemServiceImpl warehouseAreasItemService;
    @Autowired
    private CompanysServiceImpl companysService;

    /**
     * @param
@@ -156,6 +159,15 @@
        Double disQty = Objects.isNull(item.getDisQty()) ? 0 : item.getDisQty();
        Double safeQty = Objects.isNull(item.getSafeQty()) ? 0 : item.getSafeQty();
        Double sum = disQty + safeQty;

        AsnOrderItem asnOrderItem = asnOrderItemService.getById(item.getAsnItemId());
        if (Objects.isNull(asnOrderItem)) {
            if (StringUtils.isNoneBlank(asnOrderItem.getSplrCode())) {
                Companys companys = companysService.getOne(new LambdaQueryWrapper<Companys>().eq(Companys::getCode, asnOrderItem.getSplrCode()));
                orderItem.setSplrId(companys.getId());
            }
        }

        if (sum.compareTo(orderItem.getAnfme()) >= 0) {
            //完成质检,做更新操作
            if (safeQty.compareTo(0.0) > 0) {