Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

16 小时以前 bd1d4feea4f9522c69ef4c0fd72b1221eae5201f

Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

 rsf-admin/src/page/orders/purchase/PurchaseItemList.jsx

@@ -118,10 +118,13 @@
          <StyledDatagrid
            preferenceKey='purchaseItem'
            bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
            rowClick={(id, resource, record) => {
              setSelect(record)
              setEditDialog(true)
            }}
            rowClick={
              false
            //   (id, resource, record) => {
            //   setSelect(record)
            //   setEditDialog(true)
            // }
          }
            omit={['id', 'createTime', 'purchaseId', 'platItemId','asnQty', 'printQty',  'createBy', 'memo','splrCode','createBy$','statusBool']}
          >
            <NumberField source="id" />

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

@@ -8,6 +8,7 @@
import lombok.experimental.Accessors;

import java.io.Serializable;
import java.util.Date;

@Data
@ExcelAutoColumnSize
@@ -135,7 +136,7 @@
    @Excel(name = "预计送达时间")
    @ApiModelProperty("预计送达时间")
    @ExcelComment(value = "arrTime", example = "2025-05-21")
    private String arrTime;
    private Date arrTime;


    @Excel(name = "备注")

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

@@ -114,12 +114,15 @@
            MatnrGroup group = matnrGroupService.getById(groupId.toString());
            if (null != group){
                pageParam.getWhere().getMap().remove("groupId");
                List<MatnrGroup> matnrGroups = matnrGroupService.list(new LambdaQueryWrapper<MatnrGroup>().eq(MatnrGroup::getParentId, Long.parseLong(groupId.toString())).select(MatnrGroup::getId));
                if (!matnrGroups.isEmpty()) {
                    longs = matnrGroups.stream().map(MatnrGroup::getId).collect(Collectors.toList());
                if(!group.getCode().equals("01")){
                    List<MatnrGroup> matnrGroups = matnrGroupService.list(new LambdaQueryWrapper<MatnrGroup>().eq(MatnrGroup::getParentId, Long.parseLong(groupId.toString())).select(MatnrGroup::getId));
                    if (!matnrGroups.isEmpty()) {
                        longs = matnrGroups.stream().map(MatnrGroup::getId).collect(Collectors.toList());

                    }
                    longs.add(group.getId());
                }
                longs.add(group.getId());


            }
        }

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

@@ -72,8 +72,7 @@
            }
            PurchaseTemplate template = list.stream().findFirst().get();
            Purchase purchase = new Purchase();
            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
            Date date = dateFormat.parse(template.getArrTime());
            Date date = template.getArrTime();
            BeanUtils.copyProperties(template, purchase);
            purchase.setCode(template.getPoCode());
            if (StringUtils.isBlank(template.getPoCode())) {