Merge branch 'tzhneasrs' of http://47.97.1.152:5880/r/zy-asrs into tzhneasrs

zyx

2024-02-28 ea3151e1e9378a8454d3119908b47aa72f8869e6

Merge branch 'tzhneasrs' of http://47.97.1.152:5880/r/zy-asrs into tzhneasrs

 src/main/java/com/zy/asrs/controller/MobileController.java

@@ -533,7 +533,8 @@

        plaService.updateById(pla);

        SaasUtils.insertLog(2,sourceLocNo,pla.getBrand(),pla.getWeightAnfme(),getUser().getUsername(),locNo,pla.getBatch(),pla.getPackageNo());
        SaasUtils.insertLog(2,sourceLocNo,pla.getBrand(),pla.getWeightAnfme(),getUser().getUsername(),
                locNo,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop());

        return R.ok();
    }

 src/main/java/com/zy/asrs/controller/PlaController.java

@@ -204,7 +204,8 @@
            pla.setModifyTime(new Date());
            pla.setWeightAnfme(0.0);
            plaService.updateById(pla);
            SaasUtils.insertLog(1,pla.getLocNo(),pla.getBrand(),anfme,getUser().getUsername(),null,pla.getBatch(),pla.getPackageNo());
            SaasUtils.insertLog(1,pla.getLocNo(),pla.getBrand(),anfme,getUser().getUsername(),
                    null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop());
        });

        return R.ok();
@@ -359,6 +360,7 @@
        manPakOut.setStatus(0);
        manPakOut.setDocId(plaQty.getOrderDetlId());
        manPakOut.setNodeId(plaQty.getId());
        manPakOut.setCustName(plaQty.getCustomer());
        //manPakOut.setNodeId(plaQty.getOrderDetlId());
        manPakOutService.insert(manPakOut);
        return R.ok();

 src/main/java/com/zy/asrs/entity/param/PakOutDTO.java

@@ -11,6 +11,7 @@
    private String doc_num;
    private Date create_time;
    private Integer status;
    private String custName;

    public String getCreateTime$(){
        if (Cools.isEmpty(this.create_time)){

 src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java

@@ -163,7 +163,8 @@
            manLocDetl.setAnfme(locDetlAdjust.getCount());
            manLocDetl.setUpdateBy(userId);
            manLocDetl.setModiTime(now);
            SaasUtils.insertLog(3,manLocDetl.getLocNo(), manLocDetl.getMatnr(),manLocDetl.getAnfme(),user.getUsername(),null,null,null);
            SaasUtils.insertLog(3,manLocDetl.getLocNo(), manLocDetl.getMatnr(),manLocDetl.getAnfme(),user.getUsername(),
                    null,null,null,null, null);
            this.baseMapper.insert(manLocDetl);
        }
    }

 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java

@@ -663,7 +663,8 @@
            }
            orderService.checkComplete(order.getOrderNo());

            SaasUtils.insertLog(0,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme(),user.getUsername(),null,null,null);
            SaasUtils.insertLog(0,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme(),user.getUsername(),
        null,null,null,null,null);
        }


@@ -804,7 +805,8 @@
                    return R.error("更新平库库存状态失败");
                }
            }
            SaasUtils.insertLog(1,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme(),user.getUsername(),null,null,null);
            SaasUtils.insertLog(1,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme(),user.getUsername(),
                    null,null,null,null,null);

        }
        return R.ok("下架完成");
@@ -1228,7 +1230,8 @@
        pla.setLocNo(node.getUuid());

        plaService.updateById(pla);
        SaasUtils.insertLog(0,locNo,pla.getBrand(),pla.getWeightAnfme(),user.getUsername(),null,pla.getBatch(),pla.getPackageNo());
        SaasUtils.insertLog(0,locNo,pla.getBrand(),pla.getWeightAnfme(),user.getUsername(),
                null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop());
    }

    @Override
@@ -1267,7 +1270,8 @@
            pla.setStatus(GlobleParameter.PLA_STATUS_3);
        }
        plaService.updateById(pla);
        SaasUtils.insertLog(1,locNo,pla.getBrand(),anfme,null,null,pla.getBatch(),pla.getPackageNo());
        SaasUtils.insertLog(1,locNo,pla.getBrand(),anfme,null,null,
                pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop());

        //更新订单明细
        Order order = orderService.selectByNo(orderNo);

 src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java

@@ -123,7 +123,8 @@
                manLocDetl.setCreateBy(userId);
                manLocDetl.setStatus(1);
                manLocDetl.setPayment(1);
                SaasUtils.insertLog(0,manLocDetl.getLocNo(),manLocDetl.getMatnr(), manLocDetl.getAnfme(),user.getUsername(),null,null,null);
                SaasUtils.insertLog(0,manLocDetl.getLocNo(),manLocDetl.getMatnr(), manLocDetl.getAnfme(),user.getUsername(),
                        null,null,null,null,null);
                manLocDetlService.insert(manLocDetl);
            }else {
//                check.setAnfme(dto.getCount() + check.getAnfme());
@@ -164,7 +165,8 @@
                if (manLocDetl.getAnfme() - param.getCount() < 0) {
                    return R.error("物料:"+ param.getMatnr() + " 在库位中数量不足");
                } else if (manLocDetl.getAnfme() - param.getCount() == 0) {
                    SaasUtils.insertLog(1,manLocDetl.getLocNo(), manLocDetl.getMatnr(),param.getCount(),user.getUsername(),null,null,null);
                    SaasUtils.insertLog(1,manLocDetl.getLocNo(), manLocDetl.getMatnr(),param.getCount(),user.getUsername(),
                            null,null,null,null,null);
                    manLocDetlService.delete(new EntityWrapper<ManLocDetl>()
                            .eq("loc_no",node.getUuid())
                            .eq("matnr",param.getMatnr()));
@@ -174,7 +176,8 @@
                    manLocDetlService.update(manLocDetl,new EntityWrapper<ManLocDetl>()
                            .eq("loc_no",node.getUuid())
                            .eq("matnr",param.getMatnr()));
                    SaasUtils.insertLog(1,manLocDetl.getLocNo(), manLocDetl.getMatnr(),param.getCount(),user.getUsername(),null,null,null);
                    SaasUtils.insertLog(1,manLocDetl.getLocNo(), manLocDetl.getMatnr(),param.getCount(),user.getUsername(),
                            null,null,null,null,null);
                }
            }
        }
@@ -204,7 +207,8 @@
                source.setLocNo(targetNode.getUuid());
                source.setNodeId(targetNode.getId());

                SaasUtils.insertLog(2,source.getLocNo(), source.getMatnr(), source.getAnfme(),user.getUsername(),null,null,null);
                SaasUtils.insertLog(2,source.getLocNo(), source.getMatnr(), source.getAnfme(),user.getUsername(),
                        null,null,null,null,null);
                manLocDetlService.insert(source);
            }else {
//                check.setAnfme(check.getAnfme() + source.getAnfme());

 src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java

@@ -125,7 +125,8 @@
            pla.setStatus(GlobleParameter.PLA_STATUS_1);
            this.updateById(pla);

            SaasUtils.insertLog(0,pla.getLocNo(),pla.getBrand(),plaQty.getOrderWeight(),user.getUsername(),null,pla.getBatch(),pla.getPackageNo());
            SaasUtils.insertLog(0,pla.getLocNo(),pla.getBrand(),plaQty.getOrderWeight(),user.getUsername(),
                    null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop());

        });
    }
@@ -152,12 +153,23 @@
    @Override
    public Page<Pla> getStockStatisAll(Page<Pla> page) {

        List<Pla> plaList;
        if(Cools.isEmpty(page.getCondition().get("brand"))){
            page.setRecords(baseMapper.getStockStatisAll());
            plaList=baseMapper.getStockStatisAll();
        }else {
            page.setRecords(baseMapper.getStockStatisAllByBrand(page.getCondition().get("brand").toString()));
            plaList = baseMapper.getStockStatisAllByBrand(page.getCondition().get("brand").toString());
        }

        double weightSum = plaList.stream().mapToDouble(Pla::getWeight).sum();

        // 最后一条记录仅供合计重量信息展示
        Pla pla = new Pla();
        pla.setBrand("合计");
        pla.setMatnr("");
        pla.setWeight(weightSum);
        plaList.add(pla);

        page.setRecords(plaList);
        page.setTotal(0);
        return page;
    }

 src/main/java/com/zy/asrs/utils/SaasUtils.java

@@ -7,7 +7,21 @@
import java.util.Date;

public class SaasUtils {
    public static void insertLog(Integer type, String locNo, String matnr,Double anfme,String user,String targetLocNo,String batch,Integer packageNo){
    /**
     * 记录出入库日志
     * @param type
     * @param locNo
     * @param matnr
     * @param anfme
     * @param user
     * @param targetLocNo
     * @param batch
     * @param packageNo
     * @param owner 主体
     * @param workshop 车间
     */
    public static void insertLog(Integer type, String locNo, String matnr,Double anfme,
                                 String user,String targetLocNo,String batch,Integer packageNo,String owner,String workshop){
        SaasLogService bean = SpringUtils.getBean(SaasLogService.class);
        SaasLog saasLog = new SaasLog();
        saasLog.setType(type);
@@ -20,6 +34,8 @@
        saasLog.setPackageNo(packageNo);
        saasLog.setCreateBy(1L);
        saasLog.setCreateByName(user);
        saasLog.setOwner(owner);
        saasLog.setWorkshop(workshop);
        bean.insert(saasLog);
    }
}

 src/main/java/com/zy/system/entity/SaasLog.java

@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

@@ -15,6 +16,7 @@

@Data
@TableName("sys_saas_log")
@AllArgsConstructor
public class SaasLog implements Serializable {

    private static final long serialVersionUID = 1L;
@@ -59,6 +61,16 @@
    private String batch;
    private Integer packageNo;

    /**
     * 主体
     */
    private String owner;

    /**
     * 车间
     */
    private String workshop;

    public SaasLog() {}

    public SaasLog(Long id,Integer type,String locNo,String matnr,Date ioTime,Long createBy) {

 src/main/resources/mapper/ManPakOutMapper.xml

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

    <select id="selectPakOut" resultType="com.zy.asrs.entity.param.PakOutDTO">
        select * from (
          SELECT ROW_NUMBER() over (order by doc_num) as row,  doc_num,MAX(create_time) as create_time FROM man_pakout
          SELECT ROW_NUMBER() over (order by doc_num) as row,  doc_num,MAX(create_time) as create_time, cust_name as custName FROM man_pakout
           where 1=1
            <include refid="selectPakOutSql"></include>
          GROUP BY doc_num
          GROUP BY doc_num,cust_name
      ) t where t.row BETWEEN ((#{curr}-1)*#{limit}+1) and (#{curr}*#{limit})
        ORDER BY create_time DESC


 src/main/webapp/static/js/saasLog/saasLog.js

@@ -29,6 +29,8 @@
            ,{field: 'batch', align: 'center',title: '批号'}
            ,{field: 'packageNo', align: 'center',title: '包号'}
            ,{field: 'targetLocNo', align: 'center',title: '目标库位'}
            ,{field: 'owner', align: 'center',title: '主体'}
            ,{field: 'workshop', align: 'center',title: '车间'}
            ,{field: 'anfme', align: 'center',title: '数量'}
            // ,{field: 'createByName', align: 'center',title: '操作人'}
            ,{field: 'ioTime$', align: 'center',title: '操作时间'}