解缴单增加了条件status>0,打印机换了吃尺寸65*35

src/main/java/com/sy/coinage/util/printer/ZplImgConvertPrinter.java

@@ -133,8 +133,8 @@ public class ZplImgConvertPrinter {
 
         try {
 //            BufferedImage labelImg = ImageProducerUtil.createImage95_22(rfidInfoDTO);
-//            BufferedImage labelImg = ImageProducerUtil.createImage65_35(rfidInfoDTO);
-            BufferedImage labelImg = ImageProducerUtil.createImage86_54(rfidInfoDTO);
+            BufferedImage labelImg = ImageProducerUtil.createImage65_35(rfidInfoDTO);
+//            BufferedImage labelImg = ImageProducerUtil.createImage86_54(rfidInfoDTO);
 //            String zplImg = Image2Zpl.image2Zpl(labelImg);
             String zplImgNoFootDoc = ImgToZpl.convertFromImgNoFootDoc(labelImg);//没有end
 
@@ -188,8 +188,8 @@ public class ZplImgConvertPrinter {
             log.info(" print blank tag ,rfid is : {} ",rf);
 
 //            BufferedImage labelImg = ImageProducerUtil.createImageBlank95_22(rf);
-//            BufferedImage labelImg = ImageProducerUtil.createImageBlank65_35(rf);
-            BufferedImage labelImg = ImageProducerUtil.createImageBlank86_54(rf);
+            BufferedImage labelImg = ImageProducerUtil.createImageBlank65_35(rf);
+//            BufferedImage labelImg = ImageProducerUtil.createImageBlank86_54(rf);
 
             String zplImgNoFootDoc = ImgToZpl.convertFromImgNoFootDoc(labelImg);//没有end
 

src/main/java/com/sy/coinage/workshop/component/ScreenComponent.java

@@ -17,6 +17,7 @@ import com.sy.coinage.workshop.service.*;
 import com.sy.coinage.workshop.vo.ScreenDeptVO;
 import com.sy.coinage.workshop.vo.ScreenProportionVO;
 import com.sy.coinage.workshop.vo.ScreenWareVO;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -28,6 +29,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 @Component
+@Slf4j
 public class ScreenComponent {
 
     @Autowired
@@ -202,6 +204,10 @@ public class ScreenComponent {
         if (stock != null && stock.size() > 0) {
             for (Stock stock1 : stock) {
                 Product p = this.productService.getByCache(stock1.getSecuritiesId());
+                if(p == null){
+                    p = this.productService.getById(stock1.getSecuritiesId());
+                    log.info("cacheProportionInfo: product is:{} ,stock1.getSecuritiesId():{}",JSON.toJSONString(p),stock1.getSecuritiesId());
+                }
                 // 1 纪念币 2 流通币
                 if (p.getTag() == 1) {
                     proportion1 = proportion1 + (stock1.getBoxNum() == null ? 0 : stock1.getBoxNum()) + stock1.getRacketNum() * p.getBoxAmount();

src/main/java/com/sy/coinage/workshop/controller/ScreenController.java

@@ -109,7 +109,14 @@ public class ScreenController {
         Dept d = deptService.getByName("造币二部");
         ScreenDeptVO data = new ScreenDeptVO();
         // 柱图最大值
-        data.setMax(1000);
+        //<modify date=20240919>
+        //<comment>当前临时库最大容量50拍子，即 50*60 =3000  箱，按照60拍进行显示</>
+        //<old>
+       // data.setMax(1000);
+        //</old>
+        //<new>
+        data.setMax(3600); //按照60箱进行
+        //</new>
         data.setName(Arrays.asList(this.dept));
         // 产能开始
         List<Double> production = new ArrayList<>();

src/main/java/com/sy/coinage/workshop/controller/WorkshopOutboundController.java

@@ -83,6 +83,7 @@ public class WorkshopOutboundController extends BaseController {
         LambdaQueryWrapper<WorkshopOutbound> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.like(StringUtils.isNotBlank(req.getOrderNo()), WorkshopOutbound::getOrderNo, req.getOrderNo());
         queryWrapper.eq(req.getSecuritiesId() != null && req.getSecuritiesId() > 0, WorkshopOutbound::getSecuritiesId, req.getSecuritiesId());
+        queryWrapper.gt(WorkshopOutbound::getStatus,0);
         if (req.getCreateTime() != null && StringUtils.isNotBlank(String.valueOf(req.getCreateTime()))) {
             queryWrapper.between(WorkshopOutbound::getCreateTime, DateUtils.getDayStartTime(req.getCreateTime()), DateUtils.getDayEndTime(req.getCreateTime()));
         }