材料出库单二维码打印字段更新

jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/service/impl/Rdrecord11ServiceImpl.java

@@ -94,12 +94,14 @@ public class Rdrecord11ServiceImpl  implements IRdrecord11Service {
             file.mkdir();
         }
         //查询SQl
-        String sql="select  a.csysbarcode  as 缸单条码,c.cCusCode as 客户,b.cBatch as 缸号,e.cVenName as 供应商," +
-                "b.cbatchproperty9 as 染厂色号,d.cVenCode as 接收方,b.iQuantity as 数量,b.csocode as 上游订单,b.cdefine26 as 匹数," +
-                "b.comcode as 下游订单,f.cInvName as 物料,a.cCode as 发货单,'描述' as 描述 From rdrecord11 a left join  rdrecords11 b " +
-                "on a.id=b.id left join SO_SOMain c on  b.csocode=c.csocode left join OM_MOMain d on b.comcode=d.cCode " +
-                "left join  Vendor e on a.cVenCode=e.cVenCode left join  Inventory f on b.cInvCode=f.cInvCode " +
-                "where  a.cCode='"+cCode+"'";
+        String sql="select '马菲羊纺织科技有限公司' as 客户,b.comcode as 委外订单号,b.cBatch as 缸号,b.cInvCode as 物料编号,c.cInvName as 物料名称," +
+                "d.cbdefine3 as 下游供应商,d.cbdefine2 as 上游供应商,cDefine22 as 款号,b.cDefine28 as 门幅,b.cFree1 as 颜色,b.cFree6 as 克重," +
+                "b.cDefine30 as 染厂色号,b.iQuantity as 数量,e.cComUnitName as 单位,b.cdefine27 as 匹数,a.cMemo  as 备注," +
+                "concat(a.cCode,'_',b.irowno )  as 出库信息,b.iOMoDID as 委外订单行信息 " +
+                "From rdrecord11 a left join  rdrecords11 b on a.id=b.id " +
+                "left join  Inventory c on b.cInvCode=c.cInvCode left join  rdrecords11_extradefine d on b.AutoID=d.AutoID " +
+                "left join  ComputationUnit e on e.cComunitCode =c.cComunitCode " +
+                "where  a.cCode='"+cCode+"' ";
         if(org.equals("103")){
             List<Map<String, Object>> result = senYuDataSourceThree.queryForList(sql);
             if(result.size()==0){
@@ -113,6 +115,14 @@ public class Rdrecord11ServiceImpl  implements IRdrecord11Service {
             List<String> pathList=new ArrayList<>();
             for(int i=0;i<pljf.size();i++){
                 JSONObject onejson=pljf.get(i);
+                StringBuilder showText=new StringBuilder();//二维码所需字段
+                showText.append("委外订单号:"+onejson.getString("委外订单号"));
+                showText.append(",委外订单行信息:"+onejson.getString("委外订单行信息"));
+                showText.append(",缸号:"+onejson.getString("缸号"));
+                showText.append(",物料编号:"+onejson.getString("物料编号"));
+                showText.append(",物料名称:"+onejson.getString("物料名称"));
+                showText.append(",数量:"+onejson.getString("数量"));
+                showText.append(",匹数:"+onejson.getString("匹数"));
                 //生成二维码数量=
                 int num=(onejson.getBigDecimal("数量").divide(new BigDecimal(splitNum),0,BigDecimal.ROUND_UP)).intValue();
                 sum=sum+num;
@@ -122,7 +132,7 @@ public class Rdrecord11ServiceImpl  implements IRdrecord11Service {
                     String newFilePath=finalPath+"/"+serialNum+".png";
                     pathList.add(newFilePath);
                     //生成二维码图片
-                    BufferedImage bufferedImage=oConvertUtils.getBufferedImage(onejson.toJSONString(),qrWidth,qrHeight);
+                    BufferedImage bufferedImage=oConvertUtils.getBufferedImage(showText.toString(),qrWidth,qrHeight);
                     //背景图片
                     BufferedImage backImage = new BufferedImage(backImageWidth, backImageHeight,BufferedImage.TYPE_INT_RGB);
                     //显示文字 缸号，委外订单号，匹数，物料，描述，关键属性，供应商，接收方
@@ -139,17 +149,24 @@ public class Rdrecord11ServiceImpl  implements IRdrecord11Service {
                     backGraphics.setFont(font);
                     backGraphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
 
-                    backGraphics.drawString("缸号:"+onejson.getString("缸单条码"),x_text,y_text+fintSize*0);
-                    backGraphics.drawString("委外订单号:"+onejson.getString("下游订单"),x_text,y_text+(spacing+fintSize)*1);
-                    backGraphics.drawString("匹数:"+onejson.getString("匹数"),x_text,y_text+(spacing+fintSize)*2);
-                    backGraphics.drawString("物料:"+onejson.getString("物料"),x_text,y_text+(spacing+fintSize)*3);
-                    backGraphics.drawString("描述:"+onejson.getString("描述"),x_text,y_text+(spacing+fintSize)*4);
-                    backGraphics.drawString("关键属性:",x_text,y_text+(spacing+fintSize)*5);
-                    backGraphics.drawString("供应商:"+onejson.getString("供应商"),x_text,y_text+(spacing+fintSize)*6);
-                    backGraphics.drawString("接收方:"+onejson.getString("接收方"),x_text,y_text+(spacing+fintSize)*7);
+                    backGraphics.drawString("客户:"+onejson.getString("客户"),x_text,y_text+fintSize*0);
+                    backGraphics.drawString("订单号:"+onejson.getString("委外订单号"),x_text,y_text+(spacing+fintSize)*1);
+                    backGraphics.drawString("缸号:"+onejson.getString("缸号"),x_text,y_text+(spacing+fintSize)*2);
+                    backGraphics.drawString("物料:"+onejson.getString("物料名称"),x_text,y_text+(spacing+fintSize)*3);
+                    backGraphics.drawString("下游供应商:"+onejson.getString("下游供应商"),x_text,y_text+(spacing+fintSize)*4);
+                    backGraphics.drawString("上游供应商:"+onejson.getString("上游供应商"),x_text,y_text+(spacing+fintSize)*5);
+                    backGraphics.drawString("款号:"+onejson.getString("款号"),x_text,y_text+(spacing+fintSize)*6);
+                    backGraphics.drawString("物料属性（门幅，颜色，克重）:"+onejson.getString("门幅")
+                            +","+onejson.getString("颜色")+","+onejson.getString("克重"),x_text,y_text+(spacing+fintSize)*7);
+                    backGraphics.drawString("染厂色号:"+onejson.getString("染厂色号"),x_text,y_text+(spacing+fintSize)*8);
+                    backGraphics.drawString("数量:"+onejson.getString("数量"),x_text,y_text+(spacing+fintSize)*9);
+                    backGraphics.drawString("单位:"+onejson.getString("单位"),x_text,y_text+(spacing+fintSize)*10);
+                    backGraphics.drawString("匹数:"+onejson.getString("匹数"),x_text,y_text+(spacing+fintSize)*11);
+                    backGraphics.drawString("备注:"+onejson.getString("备注"),x_text,y_text+(spacing+fintSize)*12);
+                    backGraphics.drawString("出库信息:"+onejson.getString("出库信息"),x_text,y_text+(spacing+fintSize)*13);
 
                     //放图片
-                    backGraphics.drawImage(bufferedImage, x_image,y_text+spacing+(spacing+fintSize)*7, bufferedImage.getWidth(), bufferedImage.getHeight(),null);
+                    backGraphics.drawImage(bufferedImage, x_image,y_text+spacing+(spacing+fintSize)*13, bufferedImage.getWidth(), bufferedImage.getHeight(),null);
 
                     backGraphics.dispose();// 释放对象