UDI
/
udi-wms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

业务单据打印等，出入库明细打印等

Browse Source
test
anthonywj 1 year ago
parent 8677fb7fdc
commit 12f1851bba
9 changed files with 64 additions and 13 deletions
Show Stats Download Patch File Download Diff File

13
src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java
Unescape Escape View File

@ -13,10 +13,7 @@ import com.glxp.api.constant.ConstantType;
import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.auth.AuthAdmin;
import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
import com.glxp.api.entity.inout.IoOrderEntity;
import com.glxp.api.entity.inout.IoOrderInvoiceEntity;
import com.glxp.api.entity.inout.*;
import com.glxp.api.entity.system.CompanyEntity;
import com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity;
import com.glxp.api.entity.system.SystemPDFTemplateEntity;
@ -243,6 +240,7 @@ public class IoOrderDetailResultController extends BaseController {
}
}
}
List<IoOrderDetailResultEntity> updatePrints = new ArrayList<>();
int i = 1;
for (IoOrderDetailResultResponse ioOrderDetailResultResponse : ioOrderDetailResultResponseList) {
//查询第三方产品产品类别
@ -293,8 +291,15 @@ public class IoOrderDetailResultController extends BaseController {
ioOrderDetailResultData.put("createTime", dateStr);
list.add(ioOrderDetailResultData);
i++;
//更新打印状态
IoOrderDetailResultEntity orderDetailResultEntity = new IoOrderDetailResultEntity();
orderDetailResultEntity.setId(ioOrderDetailResultResponse.getId());
orderDetailResultEntity.setInoutPrintStatus(1);
orderDetailResultService.update(orderDetailResultEntity);
}
data.put("data", list);
String param = JSON.toJSONString(data);
JasperUtils.jasperReport(request, response, param, filePath + "pdf/template/" + systemPDFTemplateEntity.getPath(), "pdf");

7
src/main/java/com/glxp/api/controller/purchase/PurOrderPrintController.java
Unescape Escape View File

@ -106,12 +106,13 @@ public class PurOrderPrintController {
supData.put("billDate", MsDateUtil.formatDate(purReceiveEntity.getBillDate(), "yyyy-MM-dd"));
supData.put("auditTime", MsDateUtil.formatDate(purReceiveEntity.getAuditTime(), "yyyy-MM-dd"));
supData.put("count", obj.getCount());
supData.put("cpmctymc", obj.getCpmctymc());
supData.put("ggxh", obj.getGgxh());
supData.put("manufactory", obj.getManufactory());
supData.put("measname", obj.getMeasname());
supData.put("measname", obj.getMeasname() == null ? "" : obj.getMeasname());
supData.put("nameCode", obj.getNameCode());
supData.put("price", obj.getPrice());
supData.put("price", obj.getPrice() == null ? "" : obj.getPrice());
supData.put("supName", obj.getSupName());
supData.put("ylqxzcrbarmc", obj.getYlqxzcrbarmc());
supData.put("zczbhhzbapzbh", obj.getZczbhhzbapzbh());
@ -120,7 +121,7 @@ public class PurOrderPrintController {
}
}
data.put("data", list);
String param = JSONObject.toJSONString(data, SerializerFeature.WriteNullStringAsEmpty);
String param = JSONObject.toJSONString(data, SerializerFeature.WriteMapNullValue);
JasperUtils.jasperReport(request, response, param, filePath + "pdf/template/" + systemPDFTemplateEntity.getPath(), "pdf");
}

2
src/main/java/com/glxp/api/controller/system/SysPdfTemplateController.java
Unescape Escape View File

@ -81,7 +81,7 @@ public class SysPdfTemplateController {
data =
"[{\"area\":\"福建省厦门市湖里区\",\"vaiDate\":\"2023-03-15\",\"code\":\"1113\",\"companyName\":\"盛夏科技\",\"classes\":\"经营企业\",\"mobile\":\"18575144832\",\"index\":\"1\",\"remark\":\"12\",\"detailAddr\":\"湖里\",\"name\":\"业务许可证\",\"creditNum\":\"6464684643\",\"auditStatus\":\"审核通过\",\"expireDate\":\"2023-03-16\",\"contacts\":\"东\",\"email\":\"46456@qq.com\",\"status\":\"有效\"}]";
}
JasperUtils.jasperReport(request, response, data, filePath + "/pdf/template/"+systemPDFTemplateEntity.getPath(), "pdf");
JasperUtils.jasperReport(request, response, data, filePath + "/pdf/template/" + systemPDFTemplateEntity.getPath(), "pdf");
}

7
src/main/java/com/glxp/api/entity/inout/IoOrderDetailResultEntity.java
Unescape Escape View File

@ -183,6 +183,13 @@ public class IoOrderDetailResultEntity {
@TableField(value = "remark5")
private String remark5;
/**
* 出入库明细打印状态 0:未打印；1：已打印
*/
@TableField(value = "inoutPrintStatus")
private Integer inoutPrintStatus;
@TableField(exist = false)
private String deptCode;

4
src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java
Unescape Escape View File

@ -165,6 +165,10 @@ public class IoOrderDetailResultResponse {
private String fromInvName;
private String fromName;
/**
* 出入库明细打印状态
*/
private Integer inoutPrintStatus;
private int orderCount;

1
src/main/java/com/glxp/api/service/inout/IoAddInoutService.java
Unescape Escape View File

@ -335,6 +335,7 @@ public class IoAddInoutService {
codeTempEntity.setAction(orderEntity.getAction());
codeTempEntity.setOrderId(orderEntity.getBillNo());
codeTempEntity.setCorpOrderId(orderEntity.getCorpOrderId());
codeTempEntity.setNameCode(bizEntity.getNameCode());
codeTempEntity.setBatchNo(bizEntity.getBatchNo());
codeTempEntity.setProduceDate(bizEntity.getProductDate());
codeTempEntity.setExpireDate(bizEntity.getExpireDate());

10
src/main/java/com/glxp/api/service/inv/InvProductRationService.java
Unescape Escape View File

@ -201,6 +201,7 @@ public class InvProductRationService extends ServiceImpl<InvProductRationMapper,
Long orderId = IdUtil.getSnowflakeNextId();
purApplyEntity.setBillNo(billNo);
purApplyEntity.setId(orderId);
purApplyEntity.setBillType(ConstantStatus.BUS_ORDER_CPSG);
purApplyEntity.setInvCode(curWarehouseEntity.getCode());
purApplyEntity.setEmergency(1);
purApplyEntity.setTargetInvCode(targetWarehouseEntity.getCode());
@ -259,7 +260,7 @@ public class InvProductRationService extends ServiceImpl<InvProductRationMapper,
purPlanEntity.setBillDate(new Date());
purPlanEntity.setCreateTime(new Date());
purPlanEntity.setUpdateTime(new Date());
purPlanEntity.setBillType(ConstantStatus.BUS_ORDER_CPSG);
purPlanEntity.setBillType(ConstantStatus.BUS_ORDER_CGJH);
purPlanEntity.setStatus(invProductRationEntity.getBusAuditStatus());
String billNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.SG_ORDER, "yyyyMMdd"));
purPlanEntity.setBillNo(billNo);
@ -328,7 +329,7 @@ public class InvProductRationService extends ServiceImpl<InvProductRationMapper,
purOrderEntity.setBillDate(new Date());
purOrderEntity.setCreateTime(new Date());
purOrderEntity.setUpdateTime(new Date());
purOrderEntity.setBillType(ConstantStatus.BUS_ORDER_CPSG);
purOrderEntity.setBillType(ConstantStatus.BUS_ORDER_CGDD);
purOrderEntity.setStatus(invProductRationEntity.getBusAuditStatus());
String billNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.SG_ORDER, "yyyyMMdd"));
purOrderEntity.setBillNo(billNo);
@ -362,6 +363,8 @@ public class InvProductRationService extends ServiceImpl<InvProductRationMapper,
purOrderDetailEntity.setCount(count);
purOrderDetailEntity.setZczbhhzbapzbh(udiRlSupResponse.getZczbhhzbapzbh());
purOrderDetailEntity.setSupId(rationEntity.getSupId() + "");
if (StrUtil.isNotEmpty(udiRlSupResponse.getPrice()))
purOrderDetailEntity.setPrice(new BigDecimal(udiRlSupResponse.getPrice()));
purOrderDetailEntities.add(purOrderDetailEntity);
invProductRationEntity.setBusOrder(billNo);
}
@ -440,7 +443,8 @@ public class InvProductRationService extends ServiceImpl<InvProductRationMapper,
orderDetailBizEntity.setManufacturer(udiRlSupResponse.getManufactory());
orderDetailBizEntity.setMeasname(udiRlSupResponse.getMeasname());
orderDetailBizEntity.setSpec(udiRlSupResponse.getGgxh());
orderDetailBizEntity.setPrice(new BigDecimal(udiRlSupResponse.getPrice()));
if (StrUtil.isNotEmpty(udiRlSupResponse.getPrice()))
orderDetailBizEntity.setPrice(new BigDecimal(udiRlSupResponse.getPrice()));
orderDetailBizEntity.setCount(count);
orderDetailBizEntity.setCertCode(udiRlSupResponse.getZczbhhzbapzbh());
orderDetailBizEntity.setSupId(rationEntity.getSupId() + "");

2
src/main/java/com/glxp/api/util/JasperUtils.java
Unescape Escape View File

@ -68,9 +68,7 @@ public class JasperUtils {
os.close();
}
} catch (Exception e) {
e.printStackTrace();
}
}

31
src/main/resources/schemas/schema_v2.3.sql
Unescape Escape View File

@ -953,3 +953,34 @@ CREATE TABLE if not exists `inv_product_ration`
INSERT ignore INTO `sys_scheduled`(`id`, `cronName`, `cron`, `customerId`, `remark`)
VALUES (150, 'syncInvRation', '0 */60 * * * ?', NULL, '定量设置单据');
INSERT ignore INTO `auth_menu`(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`,
`is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`,
`create_time`, `update_by`, `update_time`, `remark`)
VALUES (2011, '库存定量设置', 1633, 10, 'sys/invRation/set', 'system/ration/InvRationSet', NULL, 1, 0, 'C', '0', '0', NULL,
NULL, '超级用户', '2023-10-13 11:03:11', NULL, NULL, NULL);
INSERT ignore INTO `auth_menu`(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`,
`is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`,
`create_time`, `update_by`, `update_time`, `remark`)
VALUES (2012, '定量新增', 2011, 1, NULL, NULL, NULL, 1, 0, 'F', '0', '0', 'system:ration:add', NULL, '超级用户',
'2023-10-18 09:34:39', NULL, NULL, NULL);
INSERT ignore INTO `auth_menu`(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`,
`is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`,
`create_time`, `update_by`, `update_time`, `remark`)
VALUES (2013, '定量删除', 2011, 2, NULL, NULL, NULL, 1, 0, 'F', '0', '0', 'system:ration:del', NULL, '超级用户',
'2023-10-18 09:35:07', NULL, NULL, NULL);
INSERT ignore INTO `auth_menu`(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`,
`is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`,
`create_time`, `update_by`, `update_time`, `remark`)
VALUES (2014, '定量修改', 2011, 3, NULL, NULL, NULL, 1, 0, 'F', '0', '0', 'system:ration:edit', NULL, '超级用户',
'2023-10-18 09:35:26', NULL, NULL, NULL);
INSERT ignore INTO `auth_menu`(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`,
`is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`,
`create_time`, `update_by`, `update_time`, `remark`)
VALUES (2015, '单据生成', 2011, 4, NULL, NULL, NULL, 1, 0, 'F', '0', '0', 'system:ration:gen', NULL, '超级用户',
'2023-10-18 09:35:50', NULL, NULL, NULL);
CALL Pro_Temp_ColumnWork('io_order_detail_result', 'inoutPrintStatus', 'tinyint', 1);

Write Preview
Loading…
Cancel
Save